[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 4194c87743f278b7041e938531adacd3caaf50e6

[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, rel_2_1 has been updated
       via  4194c87743f278b7041e938531adacd3caaf50e6 (commit)
       via  45f2b618fd0485e585b6744a51b9e9719fe1f038 (commit)
      from  715a367a2f9db3c9dc8ffbe612c0b36511d5b23d (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 4194c87743f278b7041e938531adacd3caaf50e6
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>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index a6b3171..5cf9c57 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?
@@ -385,12 +386,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 45f2b618fd0485e585b6744a51b9e9719fe1f038
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 19177e5..a6b3171 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -390,7 +390,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