[evolvis-commits] r8593: Fewer assumptions, fewer risks of failure. ↵ This should fix a few upgrading bugs?=.=?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:46:39 CET 2011


Author: mirabilos
Date: 2011-02-24 16:46:39 +0100 (Thu, 24 Feb 2011)
New Revision: 8593

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/db/20021223.sql
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-db.sh
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
Log:
Fewer assumptions, fewer risks of failure.
This should fix a few upgrading bugs.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/db/20021223.sql
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/db/20021223.sql	2011-02-24 15:46:38 UTC (rev 8592)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/db/20021223.sql	2011-02-24 15:46:39 UTC (rev 8593)
@@ -20,11 +20,14 @@
 --
 --	Each task can be assigned a category
 --
+CREATE SEQUENCE "project_categor_category_id_seq" ;
 CREATE TABLE project_category (
-category_id serial,
+category_id integer DEFAULT nextval('project_categor_category_id_seq'::text) NOT NULL,
 group_project_id int 
 	CONSTRAINT projcat_projgroupid_fk REFERENCES project_group_list(group_project_id) ON DELETE CASCADE,
-category_name text);
+category_name text,
+	CONSTRAINT "project_category_pkey" Primary Key ("category_id")
+);
 CREATE INDEX projectcategory_groupprojectid ON project_category(group_project_id);
 INSERT INTO project_category VALUES ('100','1','None');
 SELECT SETVAL('project_categor_category_id_seq',100);

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-db.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-db.sh	2011-02-24 15:46:38 UTC (rev 8592)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-db.sh	2011-02-24 15:46:39 UTC (rev 8593)
@@ -187,8 +187,14 @@
     restore)
 	pattern=$(basename $0).XXXXXX
 	newpg=$(mktemp /tmp/$pattern)
+	pg_version=$(dpkg -s postgresql | awk '/^Version: / { print $2 }')
+	if dpkg --compare-versions $pg_version lt 7.3 ; then
+	    localtrust="local all trust"
+	else
+	    localtrust="local all all trust"
+	fi
 	echo "### Next line inserted by GForge restore" > $newpg
-	echo "local all  trust" >> $newpg
+	echo "$localtrust" >> $newpg
 	#echo "host all 127.0.0.1 255.255.255.255 trust" >> $newpg
 	cat /etc/postgresql/pg_hba.conf >> $newpg
 	mv $newpg /etc/postgresql/pg_hba.conf
@@ -204,8 +210,8 @@
 	su -s /bin/sh postgres -c "createdb gforge"  || true
 	su -s /bin/sh postgres -c "/usr/lib/postgresql/bin/psql -f $RESTFILE gforge"
         perl -pi -e "s/### Next line inserted by GForge restore\n//" /etc/postgresql/pg_hba.conf
-        perl -pi -e "s/local all  trust\n//" /etc/postgresql/pg_hba.conf
+        perl -pi -e "s/$localtrust\n//" /etc/postgresql/pg_hba.conf
         #perl -pi -e "s/host all 127.0.0.1 255.255.255.255 trust\n//" /etc/postgresql/pg_hba.conf
-	/etc/init.d/postgresql restart
+	/etc/init.d/postgresql reload
 	;;
 esac

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 15:46:38 UTC (rev 8592)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 15:46:39 UTC (rev 8593)
@@ -4,10 +4,10 @@
   * [Christian] Removed .htaccess and put appropriate lines in httpd template
   * [Christian] Renamed sf-(un)register functions in (un)register
   * [Christian] Some cvs improvement 
-  * [Roland] [From 2.6] Fixed a database upgrading bug.
+  * [Roland] Fixed several database upgrading bugs.
   * [Roland] Don't fail or hang in postinst with recent ssh.
 
- -- Roland Mas <lolando at debian.org>  Tue, 11 Mar 2003 22:03:19 +0100
+ -- Roland Mas <lolando at debian.org>  Tue, 11 Mar 2003 23:32:38 +0100
 
 gforge (3pre9-0+2) experimental; urgency=low
 



More information about the evolvis-commits mailing list