Allow the existing configuration to be updated/redone

When the config exists already, ask the user if he/she
really wants to reconfigure pbuilder's config.

Small layout fixes.

Signed-off-by: Eddy Petrișor <eddy.petrisor@gmail.com>

2 files changed, 24 insertions, 12 deletions

diff --git a/debian/pbuilder.postinst b/debian/pbuilder.postinst
index 4de5873..3619353 100755
--- a/debian/pbuilder.postinst
+++ b/debian/pbuilder.postinst
@@ -26,10 +26,15 @@ case "$1" in
         CONFFILE=/etc/pbuilderrc
 
         # if there is a custom file, then we shouldn't touch it
-        if [ -f "$CONFFILE" ]
-        then
+        if [ -f "$CONFFILE" ] ; then
             CURRENTMIRROR=$(grep -E "^MIRRORSITE=" "$CONFFILE" | sed 's#MIRRORSITE=##g')
-            [ -z "$CURRENTMIRROR" ] || exit 0
+            if [ "$CURRENTMIRROR" ] ; then
+                db_input low pbuilder/rewrite || [ $? = 30 ]
+                db_go
+
+                db_get pbuilder/rewrite
+                [ "$RET" = "true" ] || exit 0
+            fi
         else
             # TODO: try creating a file only with the MIRRORSITE line
             cp "/usr/share/doc/pbuilder/examples/pbuilderrc" "$CONFFILE"
@@ -37,6 +42,8 @@ case "$1" in
             db_set pbuilder/mirrorsite ""
         fi
 
+        db_get pbuilder/mirrorsite
+        [ "$RET" = "_" ] && db_set pbuilder/mirrorsite "" || true
         db_input medium pbuilder/mirrorsite || [ $? = 30 ]
         db_go
 
@@ -45,23 +52,20 @@ case "$1" in
 
         # the "_" alternative is just a safety net,
         # but that should really never happen
-        if [ -z "$MIRRORSITE" ] || [ "$MIRRORSITE" = "_" ]
-        then
+        if [ -z "$MIRRORSITE" ] || [ "$MIRRORSITE" = "_" ] ; then
             TMPSRC=`mktemp`
             SRCLISTDIR=/etc/apt/sources.list.d
             [ -f /etc/apt/sources.list ] && cat /etc/apt/sources.list > "$TMPSRC" || true
             [ -f $SRCLISTDIR/*.sources.list ] && cat $SRCLISTDIR/*.sources.list >> "$TMPSRC" || true
             MIRRORSITE=$(grep -E '^deb ' "$TMPSRC" | head -n 1 | awk '{print $2;}')
             rm -f "$TMPSRC"
-            while [ -z "$MIRRORSITE" ]
-            do
-                db_input pbuilder/nomirror || true
+            while [ -z "$MIRRORSITE" ] ; do
+                db_input high pbuilder/nomirror || true
                 db_input high pbuilder/mirrorsite && RETCODE=$? || RETCODE=$?
                 db_go
 
                 # if the interface is non-interactive, still set a valid mirror
-                if [ $RETCODE = 30 ]
-                then
+                if [ $RETCODE = 30 ] ; then
                     MIRRORSITE="http://ftp.debian.org/debian"
                 else
                     db_get pbuilder/mirrorsite
diff --git a/debian/pbuilder.templates b/debian/pbuilder.templates
index 3887e41..1b8f0ed 100644
--- a/debian/pbuilder.templates
+++ b/debian/pbuilder.templates
@@ -5,8 +5,8 @@ _Description: Default mirror site:
  Please enter the default mirror you want to be used by pbuilder.
  .
  If you leave this field blank, there will be one attempt to autodetect
- this information. If this attempt fails, you will be prompted to insert
- valid mirror information.
+ this information. If this attempt fails, you will be prompted again
+ to insert some valid mirror information.
  .
  Here is a valid mirror example: http://ftp.debian.org/debian
 
@@ -16,3 +16,11 @@ _Description: Default mirror not found
  Mirror information detection failed and the user provided no mirror information.
  .
  Please enter valid mirror information.
+
+Template: pbuilder/rewrite
+Type: boolean
+Default: false
+_Description: Overwrite current configuration?
+ Your system seems to have already pbuilder configuration.
+ Proceeding might discard or overwrite part or the entire
+ pbuilder's configuration.