[devscripts] 02/02: uscan: Add target-path node to dehs output

James McCoy jamessan at debian.org
Wed May 14 03:10:34 UTC 2014


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

jamessan pushed a commit to branch master
in repository devscripts.

commit 4998d76eb1153ec4453733351b078eb501c091fb
Author: James McCoy <jamessan at debian.org>
Date:   Tue May 13 23:02:58 2014 -0400

    uscan: Add target-path node to dehs output
    
    The target node simply states the filename, without any reference to
    where it is stored.  The implication is that it will always be in the
    parent directory.
    
    Adding the target-path node provides a means for communicating the exact
    path without breaking anything using the target node.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 7 +++++--
 scripts/uscan.pl | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92f4a77..734f2b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,11 @@ devscripts (2.14.3) UNRELEASED; urgency=medium
   * 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)
+  * uscan:
+    + Specify file name instead of path in --dehs mode's target node.
+      (Closes: #747901)
+    + Add target-path node to dehs output for those who care about the actual
+      path to the file.
 
  -- Benjamin Drung <bdrung at debian.org>  Mon, 12 May 2014 22:01:14 +0200
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index b8a954e..8aff0f4 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1496,6 +1496,7 @@ EOF
 	    $msg .= "$mk_origtargz_out\n";
 	}
 	$dehs_tags{target} = basename($target);
+	$dehs_tags{'target-path'} = $target;
 	dehs_msg($msg);
     }
 
@@ -1800,7 +1801,7 @@ sub dehs_output ()
 
     for my $tag (qw(package debian-uversion debian-mangled-uversion
 		    upstream-version upstream-url
-		    status target messages warnings errors)) {
+		    status target target-path messages warnings errors)) {
 	if (exists $dehs_tags{$tag}) {
 	    if (ref $dehs_tags{$tag} eq "ARRAY") {
 		foreach my $entry (@{$dehs_tags{$tag}}) {

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



More information about the devscripts-devel mailing list