[evolvis-commits] r8835: Fixed an error in the code handling the initialisation of Debc =?UTF-8?Q?onf=20from=E2=86=B5=20the=20confi?==?UTF-8?Q?g=20file?=. ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:53:30 CET 2011


Author: mirabilos
Date: 2011-02-24 16:53:30 +0100 (Thu, 24 Feb 2011)
New Revision: 8835

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.config
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/handle-mainconffile.config
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.config.dsfh-in
Log:
Fixed an error in the code handling the initialisation of Debconf from
the config file.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.config
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.config	2011-02-24 15:53:29 UTC (rev 8834)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.config	2011-02-24 15:53:30 UTC (rev 8835)
@@ -1,6 +1,6 @@
 db_fget gforge/shared/db_password seen || true
 if [ "$RET" = "false" ]; then
-    if [ $(get_pw gforge/shared/db_password low) = "not-asked" ] ; then
+    if [ "$(get_pw gforge/shared/db_password low)" = "not-asked" ] ; then
 	db_set gforge/shared/db_password $(gen_random_pw)
 	db_get gforge/shared/db_password || true
 	echo "Since you asked not to see all the debconf questions, I generated a random"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/handle-mainconffile.config
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/handle-mainconffile.config	2011-02-24 15:53:29 UTC (rev 8834)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/handle-mainconffile.config	2011-02-24 15:53:30 UTC (rev 8835)
@@ -9,10 +9,7 @@
     fi
 }
 init_debconf_from_mainconffile () {
-    for i in $(grep -v "^ *#" $mainconffile \
-	| cut -d= -f1 $mainconffile \
-	| sort -u \
-	| grep .) ; do
+    for i in $(grep -v "^ *#" $mainconffile | sort -u) ; do
 	update_onevar_from_mainconfile $i
     done
 }
@@ -20,7 +17,8 @@
     key=$1
     update_onevar_from_mainconfile__retcode=0
     value=$(grep ^$key= $mainconffile | tail -1 | cut -d= -f2-)
-    db_set gforge/shared/$key $value || update_onevar_from_mainconfile__retcode=$? || true
+    if [ ! -z "$value" ] ; then
+	db_set gforge/shared/$key $value || update_onevar_from_mainconfile__retcode=$? || true
 #     case $update_onevar_from_mainconfile__retcode in
 # 	0)
 # 	    echo "$key = $value injected into Debconf OK"
@@ -34,6 +32,7 @@
 # 	    exit 1
 # 	    ;;
 #     esac
+    fi
 }
 update_mainconffile () {
     for key in $@ ; do

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.config.dsfh-in	2011-02-24 15:53:29 UTC (rev 8834)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.config.dsfh-in	2011-02-24 15:53:30 UTC (rev 8835)
@@ -17,7 +17,7 @@
 db_input low gforge/shared/admin_login || true
 db_fget gforge/shared/admin_password seen || true
 if [ "$RET" = "false" ]; then
-    if [ $(get_pw gforge/shared/admin_password high) = "not-asked" ] ; then
+    if [ "$(get_pw gforge/shared/admin_password high)" = "not-asked" ] ; then
 	db_set gforge/shared/admin_password $(gen_random_pw)
 	db_get gforge/shared/admin_password || true
 	echo "Since you asked not to see all the debconf questions, I generated a random"



More information about the evolvis-commits mailing list