[open-ils-commits] [GIT] Evergreen ILS branch master updated. 83e53887bd8eeddc1056497f9fee67547c3edbb6

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  83e53887bd8eeddc1056497f9fee67547c3edbb6 (commit)
       via  3790df4cf7223b40a74af8fe5d771013bbbe52ab (commit)
       via  ebe5a4950ae04fb844e9fbc7ade9a1b3ac34a920 (commit)
      from  0d51d18b12745c89b6dff1a04612b5fe97d4c0ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 83e53887bd8eeddc1056497f9fee67547c3edbb6
Merge: 0d51d18 3790df4
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Sep 12 11:23:04 2011 -0400

    Merge remote branch 'working/user/dbs/lp801624_blow_away_postgresql'


commit 3790df4cf7223b40a74af8fe5d771013bbbe52ab
Author: Dan Scott <dan at coffeecode.net>
Date:   Wed Sep 7 15:18:07 2011 -0400

    Display warning message and prompt before PostgreSQL removal
    
    Building on the good work in LP# 801624, use the -P "prompt" flag
    instead of -yq for apt(itude) to ensure that the user has the ability to
    quit the dependency install and reevaluate whether they want to actually
    destroy their existing PostgreSQL databases. Note that this is
    specifically in the context of the removal of the database packages,
    rather than a global change.
    
    Also, turn the inline comment into a displayed description of what is
    happening and why, along with a nice big warning.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 666e556..e97635f 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -52,6 +52,7 @@ PAY_ONLINE=Business-OnlinePayment-3.00_08.tar.gz
 PAY_ONLINE_HOST=http://ftp.perl.org/pub/CPAN/authors/id/I/IV/IVAN/
 
 APT_TOOL=aptitude -yq
+APT_SAFE_TOOL=aptitude -P
 APT_BACKPORT_TOOL=aptitude -t squeeze-backports -yq
 
 # 64 or 32 bit os?
@@ -396,12 +397,17 @@ debian_sys_config:
 install_debs:
 	$(APT_TOOL) install $(DEBS)
 
-# libpq5 / libpq-dev get installed as part of OpenSRF (a dependency
-# of apache2-prefork-dev), but these are the 8.4 versions and they
-# conflict with the 9.0 versions - so remove them, install the pinned
-# backports of 9.0, then reinstall the apache2-prefork-dev package
 install_pgsql_client_debs_90:
-	if [ `$(APT_TOOL) versions libpq-dev | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; then $(APT_TOOL) remove libpq5 libpq-dev ; fi
+	@if [ `$(APT_TOOL) versions libpq-dev | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
+		then \
+		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
+		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
+		"conflict with the 9.0 versions - so remove them, install the pinned" \
+		"backports of 9.0, then reinstall the apache2-prefork-dev package.\n\n" \
+		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
+		"databases that might currently exist on this machine." && \
+		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
+	fi
 	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_90)
 	$(APT_TOOL) install apache2-prefork-dev
 

commit ebe5a4950ae04fb844e9fbc7ade9a1b3ac34a920
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Fri Aug 19 12:20:19 2011 -0400

    conditional remove of libpq5 libpq-dev in Makefile
    
    In Makefile.install for the install_pgsql_client_debs_90 target.  Only
    do it if version 8 of libpq-dev is installed.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index bb69740..666e556 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -401,7 +401,7 @@ install_debs:
 # conflict with the 9.0 versions - so remove them, install the pinned
 # backports of 9.0, then reinstall the apache2-prefork-dev package
 install_pgsql_client_debs_90:
-	$(APT_TOOL) remove libpq5 libpq-dev
+	if [ `$(APT_TOOL) versions libpq-dev | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; then $(APT_TOOL) remove libpq5 libpq-dev ; fi
 	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_90)
 	$(APT_TOOL) install apache2-prefork-dev
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS