Author: adam-guest
Date: 2008-03-26 18:52:23 +0000 (Wed, 26 Mar 2008)
New Revision: 1207
Modified:
trunk/debian/bug/script
trunk/debian/changelog
Log:
bug/script: Don't produce an error if either of the configuration files
doesn't exist (Closes: #472748)
Modified: trunk/debian/bug/script
===================================================================
--- trunk/debian/bug/script 2008-03-26 18:19:22 UTC (rev 1206)
+++ trunk/debian/bug/script 2008-03-26 18:52:23 UTC (rev 1207)
@@ -1,8 +1,17 @@
#!/bin/sh
-echo "--- /etc/devscripts.conf ---" >&3
-egrep '^[^#]' /etc/devscripts.conf >&3
+printf "\n--- /etc/devscripts.conf ---\n" >&3
-echo
-echo "--- ~/.devscripts ---" >&3
-egrep '^[^#]' $HOME/.devscripts >&3
+if [ -f /etc/devscripts.conf ]; then
+ egrep '^[^#]' /etc/devscripts.conf >&3
+else
+ echo "Not present" >&3
+fi
+
+printf "\n--- ~/.devscripts ---\n" >&3
+
+if [ -f ~/.devscripts ]; then
+ egrep '^[^#]' ~/.devscripts >&3
+else
+ echo "Not present" >&3
+fi
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-26 18:19:22 UTC (rev 1206)
+++ trunk/debian/changelog 2008-03-26 18:52:23 UTC (rev 1207)
@@ -1,5 +1,7 @@
devscripts (2.10.21) UNRELEASED; urgency=low
+ * bug/script: Don't produce an error if either of the configuration files
+ doesn't exist (Closes: #472748)
* checkbashisms:
+ Strip off the quoted portion of a line that ends a "quoted block" before
deciding whether it's a comment line and skipping it
--
To unsubscribe, send mail to [EMAIL PROTECTED]
