Merge lp:~jseutter/landscape-client/backup-client-conf into lp:~landscape/landscape-client/trunk

[Jerry Seutter]

Up until now, dpkg-reconfigure landscape-client would ignore user choices if /etc/landscape/client.conf existed because it would refuse to overwrite client.conf. This branch backs up /etc/landscape/client.conf to /etc/landscape/client.conf.bak.~1~ if it exists before writing the new config file.

This uncovered another bug where landscape-client.config would truncate the client.conf file when dpkg-reconfigure was run. The first setting that was not specified in the config file before dpkg-reconfigure would trigger an error after dpkg-reconfigure had completed, at which point reconfiguring would leave the file half written. landscape-client.config now checks for the existence of each setting before updating the value in the debconf database. This prevents nulls from entering the debconf database so that the debconf settings remain valid and can be used to write client.conf.

[Chris Glass (tribaal)]

LGTM! +1 :)

review: Approve

[Mike Milner (milner)]

Ran some tests in a VM and all looks good! +1

review: Approve

[lp:~jseutter/landscape-client/backup-client-conf]

456. By Jerry Seutter on 2012-02-14

Use true instead of /bin/true.

=== modified file 'debian/landscape-client.config'
--- debian/landscape-client.config	2011-10-07 12:14:19 +0000
+++ debian/landscape-client.config	2012-02-14 21:25:20 +0000
@@ -6,7 +6,13 @@
 set -e
 . /usr/share/debconf/confmodule
 
-# This function also exists in the postinst, please keep them in sync
+var_in_file() {
+    var="$1"
+    file="$2"
+    line=$(grep "^$var\s*=\s*" "$file" 2>/dev/null || true)
+    echo "$line"
+}
+
 get_var_from_file() {
     var="$1"
     file="$2"
@@ -14,37 +20,34 @@
     echo "$val"
 }
 
+update_var() {
+    var="$1"
+    file="$2"
+    line=$(var_in_file $var $file)
+    if [ -n "$line" ]; then
+        val=$(get_var_from_file $var $file)
+        # Store value from config file in debconf.
+        db_set $PACKAGE/$var $val
+    fi
+}
+
 # Load config file, if it exists.
 if [ -e $CONFIGFILE ]; then
     # Config file is "ini" type, not shell, so we cannot source it
-    COMPUTER_TITLE=$(get_var_from_file "computer_title" "$CONFIGFILE")
-    ACCOUNT_NAME=$(get_var_from_file "account_name" "$CONFIGFILE")
-    REGISTRATION_PASSWORD=$(get_var_from_file "registration_password" "$CONFIGFILE")
-    URL=$(get_var_from_file "url" "$CONFIGFILE")
-    EXCHANGE_INTERVAL=$(get_var_from_file "exchange_interval" "$CONFIGFILE")
-    URGENT_EXCHANGE_INTERVAL=$(get_var_from_file "urgent_exchange_interval" "$CONFIGFILE")
-    PING_URL=$(get_var_from_file "ping_url" "$CONFIG_FILE")
-    PING_INTERVAL=$(get_var_from_file "ping_interval" "$CONFIGFILE")
-    HTTP_PROXY=$(get_var_from_file "http_proxy" "$CONFIGFILE")
-    HTTPS_PROXY=$(get_var_from_file "https_proxy" "$CONFIGFILE")
-    OTP=$(get_var_from_file "otp" "$CONFIGFILE")
-    TAGS=$(get_var_from_file "tags" "$CONFIG_FILE")
-
-    # Store values from config file into
-    # debconf db.
-
-    db_set $PACKAGE/computer_title $COMPUTER_TITLE
-    db_set $PACKAGE/account_name $ACCOUNT_NAME
-    db_set $PACKAGE/registration_password $REGISTRATION_PASSWORD
-    db_set $PACKAGE/url $URL
-    db_set $PACKAGE/exchange_interval $EXCHANGE_INTERVAL
-    db_set $PACKAGE/urgent_exchange_interval $URGENT_EXCHANGE_INTERVAL
-    db_set $PACKAGE/ping_url $PING_URL
-    db_set $PACKAGE/ping_interval $PING_INTERVAL
-    db_set $PACKAGE/http_proxy $HTTP_PROXY
-    db_set $PACKAGE/https_proxy $HTTPS_PROXY
-    db_set $PACKAGE/otp $OTP
-    db_set $PACKAGE/tags $TAGS
+    # If a setting is defined in the config file, update it in debconf
+    # db.
+    update_var "computer_title" "$CONFIGFILE"
+    update_var "account_name" "$CONFIGFILE"
+    update_var "registration_password" "$CONFIGFILE"
+    update_var "url" "$CONFIGFILE"
+    update_var "exchange_interval" "$CONFIGFILE"
+    update_var "urgent_exchange_interval" "$CONFIGFILE"
+    update_var "ping_url" "$CONFIGFILE"
+    update_var "ping_interval" "$CONFIGFILE"
+    update_var "http_proxy" "$CONFIGFILE"
+    update_var "https_proxy" "$CONFIGFILE"
+    update_var "otp" "$CONFIGFILE"
+    update_var "tags" "$CONFIGFILE"
 fi
 
 # Ask questions.

=== modified file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	2011-12-01 14:01:29 +0000
+++ debian/landscape-client.postinst	2012-02-14 21:25:20 +0000
@@ -27,6 +27,9 @@
     configure)
 
         CONFIG_FILE=/etc/landscape/client.conf
+        if [ -f $CONFIG_FILE ]; then
+            mv --backup=numbered $CONFIG_FILE $CONFIG_FILE.bak
+        fi
         if [ ! -f $CONFIG_FILE ]; then
             # Get configuration values from debconf
             db_get $PACKAGE/computer_title