Hi Vincent Danjean,
Excuse me. I missed your message since I am lazy enough not to subscribe
to this bug nor ML, yet. I just found your message on the BTS web.
------------------------------- scripts/uscan.pl -------------------------------
index a401544..c966586 100755
@@ -1517,7 +1517,9 @@ EOF
to_string => \$mk_origtargz_out,
wait_child => 1);
chomp($mk_origtargz_out);
- $path = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as)
([^,]+)\.$/;
+ $path = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as)
([^,]+)(?:,.*)?\.$/;
+ $newversion = $newversion . $options{'repacksuffix'}
+ if $mk_origtargz_out =~ /Successfully .* adding suffix\.$/;
$path = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/;
$target = basename($path);
}
As you see, current code does not catch $path if output has
, deleting 5 files from it.
With the above fix, $path is the one to orig.tar.gz from this output
instead of the pre-repackaged tarball. Also $newversion is adjusted.
So your problem should go away with my fix here changing.
scripts/uscan.pl
scripts/mk-origtargz
test/test_mk-origtargz
Since this is clean bug fix, I will push this to "main".
Then I will also push all the changes discussed (excluding qx and
documentation updates to "osamu" branch since BTS posted code has been
rebased to the HEAD. This should make it easy for others.
Osamu
