From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 21 Aug 2015 12:08:23 +0000 (+0100)
Subject: quilt fixup: Break out quilt_fixup_linkorigs (nfc)
X-Git-Tag: debian/1.4~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=229c097427a1f108ba9f0ca44d5d21080de2ec64

quilt fixup: Break out quilt_fixup_linkorigs (nfc)
---

diff --git a/dgit b/dgit
index 4675944f..92e48a07 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)) {