summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 13:08:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-08-21 17:28:07 +0100
commit229c097427a1f108ba9f0ca44d5d21080de2ec64 (patch)
treee5209ccfc1dd8b7ae838c459987fac6465d3e474 /dgit
parent3f6aad2374593c67bb305dac75b3e7e249cfc828 (diff)
quilt fixup: Break out quilt_fixup_linkorigs (nfc)
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit19
1 files changed, 13 insertions, 6 deletions
diff --git a/dgit b/dgit
index 4675944..92e48a0 100755
--- a/dgit
+++ b/dgit
@@ -2774,6 +2774,18 @@ sub quilt_fixup_mkwork ($) {
runcmd @git, qw(reset --hard), $headref;
}
+sub quilt_fixup_linkorigs ($$) {
+ my ($upstreamversion, $fn) = @_;
+ # calls $fn->($leafname);
+
+ foreach my $f (<../../../../*>) { #/){
+ my $b=$f; $b =~ s{.*/}{};
+ next unless is_orig_file $b, srcfn $upstreamversion,'';
+ link_ltarget $f, $b or die "$b $!";
+ $fn->($b);
+ }
+}
+
sub quilt_fixup_multipatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
@@ -2844,12 +2856,7 @@ END
print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
};
- foreach my $f (<../../../../*>) { #/){
- my $b=$f; $b =~ s{.*/}{};
- next unless is_orig_file $b, srcfn $upstreamversion,'';
- link_ltarget $f, $b or die "$b $!";
- $dscaddfile->($b);
- }
+ quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
my @files=qw(debian/source/format debian/rules);
foreach my $maybe (qw(debian/patches debian/source/options)) {