diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | tests/lib | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 07dbba6..571ab67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (2.5~) unstable; urgency=medium * dgit-maint-merge(7): New tutorial manpage from Sean Whitton. + * Test suite bugfixes. -- @@ -381,7 +381,8 @@ t-setup-done () { local savedirs=$2 local importeval=$3 - exec 4>$tmp/IMPORT.new + local import=IMPORT.${0##*/} + exec 4>$tmp/$import.new local vn for vn in $savevars; do @@ -390,11 +391,11 @@ t-setup-done () { ' $vn "$(eval "printf '%s\n' \"\$$vn\"")" done - (set -e; cd $tmp; tar cf IMPORT.tar $savedirs) + (set -e; cd $tmp; tar cf $import.tar $savedirs) printf >&4 "\n%s\n" "$importeval" - mv -f $tmp/IMPORT.new $tmp/IMPORT + mv -f $tmp/$import.new $tmp/$import } t-setup-import () { @@ -412,7 +413,7 @@ t-setup-import () { lock="$setupsrc.lock" fi - local simport="$setupsrc/IMPORT" + local simport="$setupsrc/IMPORT.$setupname" if ! [ -e "$simport" ]; then with-lock-ex -w "$lock" \ |