summaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 16:44:27 +0100
committerSean Whitton <spwhitton@spwhitton.name>2019-07-07 09:54:19 +0100
commit6fabc803cce029814512b9246403812e4c093f50 (patch)
tree89560aa61fe9ebc45a97fe3ae378873ba78b11a0 /infra
parentf7ca5b3659a09a796bbeb3cee93fbf3ab22755a4 (diff)
dgit-repos-server: tag2upload: Cope with native packages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'infra')
-rwxr-xr-xinfra/dgit-repos-server9
1 files changed, 6 insertions, 3 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 68429eb..df0be6b 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;