Hi,
I have second thought after a while :-)
> Also, we're already parsing information about mk-origtargz's output, so
> why shouldn't that be used to appropriately set the the new filename in
> uscan?
This is rather fragile scheme but if you say so.
How about attached.
I added (?:,.*)? to path since
print ", deleting ${deletecount} files from it";
may be inserted. What do you think?
Regards,
Osamu
>From 7540e093bf5e007cf1aca92659963ec67de8af61 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <[email protected]>
Date: Sat, 5 Sep 2015 01:39:52 +0900
Subject: [PATCH 1/2] print "adding suffix" if so
---
scripts/mk-origtargz.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index ef2c75e..dde2019 100755
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -531,7 +531,9 @@ if ($same_name) {
}
}
-if ($deletecount) {
+if ($deletecount and $suffix) {
+ print ", deleting ${deletecount} files from it and adding suffix";
+} elsif ($deletecount) {
print ", deleting ${deletecount} files from it";
}
if ($zipfile_deleted) {
--
2.1.4
>From 2f42d5adb778c8e7e2e16ccae3b198d445008598 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <[email protected]>
Date: Sat, 5 Sep 2015 02:11:56 +0900
Subject: [PATCH 2/2] change by adding suffix
---
scripts/uscan.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 33f3ad4..3f8aa25 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -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);
}
--
2.1.4
