Author: schoenfeld
Date: 2010-01-11 10:49:35 +0000 (Mon, 11 Jan 2010)
New Revision: 2081
Modified:
trunk/debian/changelog
trunk/scripts/nmudiff.sh
Log:
nmudiff: Fix "[nmudiff] please include --tagpending option" by applying the
patch from Gregor Herrmann. Thanks. (Closes: #559549)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-01-11 03:14:54 UTC (rev 2080)
+++ trunk/debian/changelog 2010-01-11 10:49:35 UTC (rev 2081)
@@ -1,5 +1,6 @@
devscripts (2.10.62) UNRELEASED; urgency=low
+ [ James Vega ]
* debcommit:
+ Fix a regression where only debian/ changes were being committed in CVS
repos. Thanks to Thomas Parmelan for the patch. (Closes: #563918)
@@ -19,8 +20,12 @@
* Devscripts::Versort: Use Dpkg::Version::version_compare instead of
invoking “dpkg --compare-versions”.
- -- James Vega <[email protected]> Sat, 02 Jan 2010 22:30:26 -0500
+ [ Patrick Schoenfeld ]
+ * nmudiff: Fix "[nmudiff] please include --tagpending option" by applying the
+ patch from Gregor Herrmann. Thanks. (Closes: #559549)
+ -- Patrick Schoenfeld <[email protected]> Mon, 11 Jan 2010 11:47:42 +0100
+
devscripts (2.10.61) unstable; urgency=low
* bts: Correct the address used to email the submitter when using the "bts
Modified: trunk/scripts/nmudiff.sh
===================================================================
--- trunk/scripts/nmudiff.sh 2010-01-11 03:14:54 UTC (rev 2080)
+++ trunk/scripts/nmudiff.sh 2010-01-11 10:49:35 UTC (rev 2081)
@@ -305,21 +305,19 @@
exit 1
fi
+TO_ADDRESSES_SENDMAIL=""
+TO_ADDRESSES_MUTT=""
+BCC_ADDRESS_SENDMAIL=""
+BCC_ADDRESS_MUTT=""
+TAGS=""
if [ "$NMUDIFF_NEWREPORT" = "yes" ]; then
TO_ADDRESSES_SENDMAIL="[email protected]"
TO_ADDRESSES_MUTT="[email protected]"
- BCC_ADDRESS_SENDMAIL=""
- BCC_ADDRESS_MUTT=""
TAGS="Package: $SOURCE
Version: $OLDVERSION
Severity: normal
-Tags: patch"
+Tags: patch pending"
else
- TO_ADDRESSES_SENDMAIL=""
- TO_ADDRESSES_MUTT=""
- BCC_ADDRESS_SENDMAIL="[email protected]"
- BCC_ADDRESS_MUTT="-b [email protected]"
- TAGS=""
for b in $CLOSES; do
TO_ADDRESSES_SENDMAIL="$TO_ADDRESSES_SENDMAIL,
[email protected]"
@@ -328,11 +326,19 @@
TAGS="$TAGS
tags $b + patch"
fi
+ if [ "$NMUDIFF_DELAY" != "0" ] && [ "`bts select bugs:$b tag:pending`"
!= "$b" ]; then
+ TAGS="$TAGS
+tags $b + pending"
+ fi
done
TO_ADDRESSES_SENDMAIL=$(echo "$TO_ADDRESSES_SENDMAIL" | tail -n +2)
- TAGS=$(echo "$TAGS" | tail -n +2)
- TAGS="$TAGS
+ if [ "$TAGS" != "" ]; then
+ TAGS=$(echo "$TAGS" | tail -n +2)
+ TAGS="$TAGS
thanks"
+ BCC_ADDRESS_SENDMAIL="[email protected]"
+ BCC_ADDRESS_MUTT="-b [email protected]"
+ fi
fi
TMPNAM="$( tempfile )"
--
To unsubscribe, send mail to [email protected].
