Author: jamessan
Date: 2009-05-25 21:43:09 +0000 (Mon, 25 May 2009)
New Revision: 1889
Modified:
trunk/debian/changelog
trunk/scripts/uscan.pl
Log:
uscan: Log the correct filename when running the post-download action. Simplify
the surrounding logic so the logging and command are less likely to get out of
sync in the future.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-05-25 16:39:04 UTC (rev 1888)
+++ trunk/debian/changelog 2009-05-25 21:43:09 UTC (rev 1889)
@@ -1,8 +1,14 @@
devscripts (2.10.51) UNRELEASED; urgency=low
+ [ Adam D. Barratt ]
* uscan: Make a regular expression example in the manpage clearer. Thanks,
Jason Heeris. (Closes: #530362)
+ [ James Vega ]
+ * uscan: Log the correct filename when running the post-download action.
+ Simplify the surrounding logic so the logging and command are less likely
+ to get out of sync in the future.
+
-- Adam D. Barratt <[email protected]> Thu, 21 May 2009 21:59:23 +0100
devscripts (2.10.50) unstable; urgency=low
Modified: trunk/scripts/uscan.pl
===================================================================
--- trunk/scripts/uscan.pl 2009-05-25 16:39:04 UTC (rev 1888)
+++ trunk/scripts/uscan.pl 2009-05-25 21:43:09 UTC (rev 1889)
@@ -1401,25 +1401,20 @@
$action =~ s/^uupdate/uupdate --no-symlink/;
}
+ my $actioncmd;
if ($watch_version > 1) {
- print "-- Executing user specified script\n $action
--upstream-version $newversion $newfile_base" if $verbose;
- if ($dehs) {
- my $msg = "Executing user specified script: $action
--upstream-version $newversion $newfile_base; output:\n";
- $msg .= `$action --upstream-version $newversion $usefile 2>&1`;
- dehs_msg($msg);
- } else {
- system("$action --upstream-version $newversion $usefile");
- }
+ $actioncmd = "$action --upstream-version $newversion $usefile";
} else {
- print "-- Executing user specified script $action $newfile_base
$newversion" if $verbose;
- if ($dehs) {
- my $msg = "Executing user specified script: $action
$newfile_base $newversion; output:\n";
- $msg .= `$action $usefile $newversion 2>&1`;
- dehs_msg($msg);
- } else {
- system("$action $usefile $newversion");
- }
+ $actioncmd = "$action $usefile $newversion";
}
+ print "-- Executing user specified script\n $actioncmd\n" if
$verbose;
+ if ($dehs) {
+ my $msg = "Executing user specified script: $actioncmd; output:\n";
+ $msg .= `$actioncmd 2>&1`;
+ dehs_msg($msg);
+ } else {
+ system($actioncmd);
+ }
}
return 0;
--
To unsubscribe, send mail to [email protected].
