[devscripts] 01/02: uscan: Output basename of file in dehs' target node

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 4f29ad32f92794c1c25634479def47e16c4adcc1
Author: James McCoy <jamessan at debian.org>
Date:   Tue May 13 22:59:15 2014 -0400

    uscan: Output basename of file in dehs' target node
    
    Regression introduced in 2d40067cbb9f3e8a5be82ba95707fc4eb8adc73f
    
    Closes: #747901
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  4 ++++
 scripts/uscan.pl | 16 ++++++++++------
 test/test_uscan  | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4fdd11..92f4a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ devscripts (2.14.3) UNRELEASED; urgency=medium
     autopkgtest.
   * Add missing zip autopkgtest dependency (used by test_uscan).
 
+  [ James McCoy ]
+  * uscan: Specify file name instead of path in --dehs mode's target node.
+    (Closes: #747901)
+
  -- Benjamin Drung <bdrung at debian.org>  Mon, 12 May 2014 22:01:14 +0200
 
 devscripts (2.14.2) unstable; urgency=medium
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 8ea1942..b8a954e 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1481,17 +1481,21 @@ EOF
 	      to_string => \$mk_origtargz_out,
 	      wait_child => 1);
 	chomp($mk_origtargz_out);
-	$target = $1 if  $mk_origtargz_out =~ /Successfully .* to ([^,]+)\.$/;
-	$target = $1 if  $mk_origtargz_out =~ /Leaving (.*) where it is/;
+	$target = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as) ([^,]+)\.$/;
+	$target = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/;
     }
 
     if ($verbose) {
 	print "-- Successfully downloaded updated package $newfile_base\n";
-	print "-- $mk_origtargz_out\n";
+	if (defined $mk_origtargz_out) {
+	    print "-- $mk_origtargz_out\n";
+	}
     } elsif ($dehs) {
-	my $msg = "Successfully downloaded updated package $newfile_base\n".
-	          "$mk_origtargz_out\n";
-	$dehs_tags{target} = $target;
+	my $msg = "Successfully downloaded updated package $newfile_base\n";
+	if (defined $mk_origtargz_out) {
+	    $msg .= "$mk_origtargz_out\n";
+	}
+	$dehs_tags{target} = basename($target);
 	dehs_msg($msg);
     }
 
diff --git a/test/test_uscan b/test/test_uscan
index 79644a5..c7e8e73 100755
--- a/test/test_uscan
+++ b/test/test_uscan
@@ -85,7 +85,7 @@ END
       python -m SimpleHTTPServer $PORT &
       echo $! > pid )
 
-    (cd $TMPDIR/$PKG ; $COMMAND --repack --compression=$to_comp)
+    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMAND --dehs --repack --compression=$to_comp) 2>&1 )
 
     TARBALL=${PKG}_1.orig.tar.$to_comp
     if [ "$from_ext" != "tar.$to_comp" ]
@@ -98,6 +98,8 @@ END
     CONTENTS="$(tar atf $TMPDIR/$TARBALL)"
     assertTrue 'file contents missing'	\
                 $(containsName "$CONTENTS" content)
+    assertTrue "malfored target in dehs output: $OUTPUT" \
+               $(containsName "$OUTPUT" "<target>$TARBALL</target>")
 
     cleanup
 
@@ -142,7 +144,7 @@ END
       python -m SimpleHTTPServer $PORT &
       echo $! > pid )
 
-    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMAND --repack --compression=$to_comp) )
+    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMAND --dehs --repack --compression=$to_comp) )
 
     TARBALL=${PKG}_1.orig.tar.$to_comp
     assertTrue 'unrepacked zipfile present' "[ -f $TMPDIR/${PKG}-1.zip ]"
@@ -152,6 +154,8 @@ END
     CONTENTS="$(tar atf $TMPDIR/$TARBALL)"
     assertTrue 'file contents missing'	\
                 $(containsName "$CONTENTS" content)
+    assertTrue "malfored target in dehs output: $OUTPUT" \
+               $(containsName "$OUTPUT" "<target>$TARBALL</target>")
 
     cleanup
 
@@ -270,7 +274,7 @@ END
       python -m SimpleHTTPServer $PORT &
       echo $! > pid )
 
-    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMAND --repack) 2>&1)
+    (cd $TMPDIR/$PKG ; $COMMAND --repack)
 
     TARBALL=${PKG}_1.orig.tar.xz
     assertTrue 'unrepacked zipfile not present' "[ -f $TMPDIR/${PKG}-1.zip ]"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git