chiark / gitweb /
dopush: Move $upstreamversion setting out to give it wider scope
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 19 Oct 2016 23:23:17 +0000 (00:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 30 Oct 2016 16:35:58 +0000 (16:35 +0000)
No functional change yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index e261a2982f046dedbf6692b2d1a0b3b47b568e3e..e489150ec790f0959449d5d749e0bfba00e6bfa5 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3236,11 +3236,12 @@ END
     my $dgithead = $actualhead;
     my $maintviewhead = undef;
 
+    my $upstreamversion = $clogp->{Version};
+    $upstreamversion =~ s/-[^-]*$//;
+
     if (madformat_wantfixup($format)) {
        # user might have not used dgit build, so maybe do this now:
        if (quiltmode_splitbrain()) {
-           my $upstreamversion = $clogp->{Version};
-           $upstreamversion =~ s/-[^-]*$//;
            changedir $ud;
            quilt_make_fake_dsc($upstreamversion);
            my $cachekey;