From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Mar 2015 16:00:52 +0000 (+0000)
Subject: Bugfixes (now tests/tests/clone-nogit works)
X-Git-Tag: debian/0.30~240
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1c6183785fa3a9f6fe60a55bb9ff200963b4e791

Bugfixes (now tests/tests/clone-nogit works)
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 6932d14a..e177a839 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -1,10 +1,12 @@
-#
+# -*- perl -*-
 
 package Debian::Dgit;
 
 use strict;
 use warnings;
 
+use POSIX;
+
 BEGIN {
     use Exporter   ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
@@ -14,7 +16,7 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $branchprefix);
-    %EXPORT_TAGS = ( policyflags => qw() );
+    %EXPORT_TAGS = ( policyflags => [qw()] );
     @EXPORT_OK   = qw();
 }
 
@@ -51,7 +53,7 @@ sub git_for_each_ref ($$) {
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
     # $reftail is RHS of ref after refs/\w+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
-    my $fh = new IO::File, "-|", qw(git for-each-ref), $pattern or die $!;
+    my $fh = new IO::File "-|", qw(git for-each-ref), $pattern or die $!;
     while (<$fh>) {
 	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
 	$func->($1,$2,$3,$4);
diff --git a/dgit b/dgit
index 9d40ceef..088c5a23 100755
--- a/dgit
+++ b/dgit
@@ -52,6 +52,7 @@ our $new_package = 0;
 our $ignoredirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;
+our %supersedes;
 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;
@@ -1562,6 +1563,7 @@ sub push_mktag ($$$$$$$) {
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
     my $delibs = join(" ", "",@deliberatelies);
+    my $declaredistro = access_basedistro();
     open TO, '>', $tfn->('.tmp') or die $!;
     print TO <<END or die $!;
 object $head
@@ -1570,7 +1572,7 @@ tag $tag
 tagger $authline
 
 $package release $cversion for $clogsuite ($csuite) [dgit]
-[dgit distro=$distro$delibs]
+[dgit distro=$declaredistro$delibs]
 END
     foreach my $ref (sort keys %supersedes) {
 		    print TO <<END or die $!;