The following commit has been merged in the master branch:
commit 343d00558577b9bc12c381850cdb804658547bb8
Author: James Vega <[email protected]>
Date: Thu Dec 2 20:59:33 2010 -0500
pts-subscribe: Handle “--until 0” the same as “--forever”.
Closes: #604740
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index ad4b82a..5a395ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ devscripts (2.10.70) UNRELEASED; urgency=low
* debuild: Properly quote shell variable when parsing options. (Closes:
#556248)
+ * pts-subscribe: Handle “--until 0” the same as “--forever”. (Closes:
+ #604740)
-- James Vega <[email protected]> Thu, 02 Dec 2010 20:27:34 -0500
diff --git a/scripts/pts-subscribe.sh b/scripts/pts-subscribe.sh
index 3a0e8c3..0cb7413 100755
--- a/scripts/pts-subscribe.sh
+++ b/scripts/pts-subscribe.sh
@@ -154,16 +154,14 @@ if [ "$ACTION" = "unsubscribe" ]; then
echo "$ACTION $pkg $DEBEMAIL" | mail [email protected]
else
# Check for an "at" command
- if [ "$PTS_UNTIL" != forever ]; then
+ if [ "$PTS_UNTIL" != forever -a "$PTS_UNTIL" -ne 0 ]; then
if ! command -v at >/dev/null 2>&1; then
echo "$PROGNAME: Could not find the \"at\" command; you must have
the" >&2
echo "\"at\" package installed to run this script." >&2
exit 1
fi
- fi
- cd /
- if [ "$PTS_UNTIL" != forever ]; then
+ cd /
TEMPFILE=$(mktemp) || { echo "$PROGNAME: Couldn't create tempfile!"
>&2; exit 1; }
trap "rm -f '$TEMPFILE'" 0 1 2 3 7 10 13 15
echo "echo 'unsubscribe $pkg $DEBEMAIL' | mail [email protected]" | \
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
