From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jul 2019 15:44:27 +0000 (+0100)
Subject: dgit-repos-server: tag2upload: Cope with native packages
X-Git-Tag: archive/debian/9.1~54
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6fabc803cce029814512b9246403812e4c093f50;p=dgit.git

dgit-repos-server: tag2upload: Cope with native packages

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

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 68429eb7..df0be6bf 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -1199,6 +1199,8 @@ END
     my $quilt;
     my $distro_ok;
 
+    confess if defined $upstreamt;
+
     parsetag_general sub {
 	if (m/^(\S+) / && exists $need{$1}) {
 	    $_ = $';
@@ -1244,8 +1246,6 @@ END
     }
     runcmd @fetch;
 
-    $upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die;
-
     runcmd qw(git checkout -q), "refs/tags/$tagval";
 
     @fetch = (@dgit, qw(fetch), $suite);
@@ -1255,7 +1255,10 @@ END
 	failedcmd @fetch unless $? == 4*256;
     }
     # this is just to get the orig, so we don't really care about the ref
-    runcmd qw(git deborig), "$upstreamc";
+    if (defined $upstreamc) {
+	$upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die;
+	runcmd qw(git deborig), "$upstreamc";
+    }
 
     my @dgitcmd;
     push @dgitcmd, @dgit;