* Clean up reportbug script a bit, and extend it to dis...

Author: mdz
Date: 2003-09-03 15:37:30 GMT
* Clean up reportbug script a bit, and extend it to distinguish between a
configuration file not existing and the user declining to submit it with
the report

diff --git a/debian/bugscript b/debian/bugscript
index 4e8e628585563eb4f46313bc1be205d600fadb7e..8423e07c26d76f39a1a23ad4d10cfd5b36da6ab8 100755 (executable)
--- a/debian/bugscript
+++ b/debian/bugscript
@@ -11,27 +11,23 @@ your bug report.  This information may help to diagnose your problem.
 
 EOF
 
 
 EOF
 

-yesno "May I include your apt configuration (/etc/apt/apt.conf)? [Y/n] " yep
+yesno "May I include your apt configuration (/etc/apt/apt.conf et al)? [Y/n] " yep

 
 if [ "$REPLY" = "yep" ]; then
   echo -e "\n-- apt-config dump --\n" >&3
   apt-config dump >&3 2>&1
 fi
 
 
 if [ "$REPLY" = "yep" ]; then
   echo -e "\n-- apt-config dump --\n" >&3
   apt-config dump >&3 2>&1
 fi
 

-if [ -f /etc/apt/preferences ]; then
-  yesno "May I include your apt preferences (/etc/apt/preferences)? [Y/n] " yep
-
-  if [ "$REPLY" = "yep" ]; then
-    echo -e "\n-- /etc/apt/preferences --\n" >&3
-    cat /etc/apt/preferences >&3
-  fi
-fi
-
-if [ -f /etc/apt/sources.list ]; then
-  yesno "May I include your sources.list (/etc/apt/sources.list)? [Y/n] " yep
-
-  if [ "$REPLY" = "yep" ]; then
-    echo -e "\n-- /etc/apt/sources.list --\n" >&3
-    cat /etc/apt/sources.list >&3
+for config in /etc/apt/preferences /etc/apt/sources.list; do
+  if [ -f $config ]; then
+    yesno "May I include your $config configuration file? [Y/n] " yep
+    if [ "$REPLY" = "yep" ]; then
+      echo -e "\n-- $config --\n" >&3
+      cat $config >&3
+    else
+      echo -e "\n-- ($config present, but not submitted) --\n" >&3
+    fi
+  else
+    echo -e "\n-- (no $config present) --\n" >&3

   fi
   fi

-fi
+done

diff --git a/debian/changelog b/debian/changelog
index 901a9ef9853e4c00fab2513cf35ea232b724ce9a..6ee78740622afbb55b2c1a6ad1972b58b6245410 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ apt (0.5.11) unstable; urgency=low
   * In apt.conf(5), give the fully qualified name of Dir::Bin::Methods,
     rather than just "methods"
   * Add new nb and nn translations from Petter Reinholdtsen <pere@hungry.com>
   * In apt.conf(5), give the fully qualified name of Dir::Bin::Methods,
     rather than just "methods"
   * Add new nb and nn translations from Petter Reinholdtsen <pere@hungry.com>

+  * Clean up reportbug script a bit, and extend it to distinguish between a
+    configuration file not existing and the user declining to submit it with
+    the report

 
  --
 
 
  --