X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=1bde3279b359c333cf7942fdaf15ccc1ef475836;hp=3a737d0b0bbd607dc002542fdd9f582bf14edfaa;hb=e23c0f9c068457c33e869f720d30e3c105976dba;hpb=2a7411655b752fddfc8955f2967dbdc504d50451

diff --git a/dgit b/dgit
index 3a737d0b..1bde3279 100755
--- a/dgit
+++ b/dgit
@@ -63,7 +63,8 @@ our @ropts;
 our $sign = 1;
 our $dryrun_level = 0;
 our $changesfile;
-our $buildproductsdir = '..';
+our $buildproductsdir;
+our $bpd_glob;
 our $new_package = 0;
 our $ignoredirty = 0;
 our $rmonerror = 1;
@@ -189,11 +190,6 @@ sub debiantag ($$) {
     return $tagformatfn->($v, $distro);
 }
 
-sub debiantag_maintview ($$) { 
-    my ($v,$distro) = @_;
-    return "$distro/".dep14_version_mangle $v;
-}
-
 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
 
 sub lbranch () { return "$branchprefix/$csuite"; }
@@ -293,6 +289,11 @@ sub dgit_privdir () {
     our $dgit_privdir_made //= ensure_a_playground 'dgit';
 }
 
+sub bpd_abs () {
+    my $r = $buildproductsdir;
+    $r = "$maindir/$r" unless $r =~ m{^/};
+}
+
 sub branch_gdr_info ($$) {
     my ($symref, $head) = @_;
     my ($status, $msg, $current, $ffq_prev, $gdrlast) =
@@ -962,59 +963,6 @@ sub access_giturl (;$) {
     return "$url/$package$suffix";
 }	       
 
-sub parsecontrolfh ($$;$) {
-    my ($fh, $desc, $allowsigned) = @_;
-    our $dpkgcontrolhash_noissigned;
-    my $c;
-    for (;;) {
-	my %opts = ('name' => $desc);
-	$opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
-	$c = Dpkg::Control::Hash->new(%opts);
-	$c->parse($fh,$desc) or die "parsing of $desc failed";
-	last if $allowsigned;
-	last if $dpkgcontrolhash_noissigned;
-	my $issigned= $c->get_option('is_pgp_signed');
-	if (!defined $issigned) {
-	    $dpkgcontrolhash_noissigned= 1;
-	    seek $fh, 0,0 or die "seek $desc: $!";
-	} elsif ($issigned) {
-	    fail "control file $desc is (already) PGP-signed. ".
-		" Note that dgit push needs to modify the .dsc and then".
-		" do the signature itself";
-	} else {
-	    last;
-	}
-    }
-    return $c;
-}
-
-sub parsecontrol {
-    my ($file, $desc, $allowsigned) = @_;
-    my $fh = new IO::Handle;
-    open $fh, '<', $file or die "$file: $!";
-    my $c = parsecontrolfh($fh,$desc,$allowsigned);
-    $fh->error and die $!;
-    close $fh;
-    return $c;
-}
-
-sub getfield ($$) {
-    my ($dctrl,$field) = @_;
-    my $v = $dctrl->{$field};
-    return $v if defined $v;
-    fail "missing field $field in ".$dctrl->get_option('name');
-}
-
-sub parsechangelog {
-    my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
-    my $p = new IO::Handle;
-    my @cmd = (qw(dpkg-parsechangelog), @_);
-    open $p, '-|', @cmd or die $!;
-    $c->parse($p);
-    $?=0; $!=0; close $p or failedcmd @cmd;
-    return $c;
-}
-
 sub commit_getclogp ($) {
     # Returns the parsed changelog hashref for a particular commit
     my ($objid) = @_;
@@ -1295,7 +1243,14 @@ END
     }
     my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
     @releasefiles = @inreleasefiles if @inreleasefiles;
-    die "apt updated wrong number of Release files (@releasefiles), erk"
+    if (!@releasefiles) {
+	fail <<END;
+apt seemed to not to update dgit's cached Release files for $isuite.
+(Perhaps $cache
+ is on a filesystem mounted `noatime'; if so, please use `relatime'.)
+END
+    }
+    die "apt updated too many Release files (@releasefiles), erk"
 	unless @releasefiles == 1;
 
     ($aptget_releasefile) = @releasefiles;
@@ -2163,7 +2118,7 @@ sub generate_commits_from_dsc () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
-	my $upper_f = "$maindir/../$f";
+	my $upper_f = (bpd_abs()."/$f");
 
 	printdebug "considering reusing $f: ";
 
@@ -2171,12 +2126,12 @@ sub generate_commits_from_dsc () {
 	    printdebug "linked (using ...,fetch).\n";
 	} elsif ((printdebug "($!) "),
 		 $! != ENOENT) {
-	    fail "accessing ../$f,fetch: $!";
+	    fail "accessing $buildproductsdir/$f,fetch: $!";
 	} elsif (link_ltarget $upper_f, $f) {
 	    printdebug "linked.\n";
 	} elsif ((printdebug "($!) "),
 		 $! != ENOENT) {
-	    fail "accessing ../$f: $!";
+	    fail "accessing $buildproductsdir/$f: $!";
 	} else {
 	    printdebug "absent.\n";
 	}
@@ -2191,14 +2146,14 @@ sub generate_commits_from_dsc () {
 	    printdebug "linked.\n";
 	} elsif ((printdebug "($!) "),
 		 $! != EEXIST) {
-	    fail "saving ../$f: $!";
+	    fail "saving $buildproductsdir/$f: $!";
 	} elsif (!$refetched) {
 	    printdebug "no need.\n";
 	} elsif (link $f, "$upper_f,fetch") {
 	    printdebug "linked (using ...,fetch).\n";
 	} elsif ((printdebug "($!) "),
 		 $! != EEXIST) {
-	    fail "saving ../$f,fetch: $!";
+	    fail "saving $buildproductsdir/$f,fetch: $!";
 	} else {
 	    printdebug "cannot.\n";
 	}
@@ -2342,22 +2297,14 @@ sub generate_commits_from_dsc () {
     }
 
     my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
-    debugcmd "|",@clogcmd;
-    open CLOGS, "-|", @clogcmd or die $!;
-
     my $clogp;
     my $r1clogp;
 
     printdebug "import clog search...\n";
+    parsechangelog_loop \@clogcmd, "package changelog", sub {
+	my ($thisstanza, $desc) = @_;
+	no warnings qw(exiting);
 
-    for (;;) {
-	my $stanzatext = do { local $/=""; <CLOGS>; };
-	printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
-	last if !defined $stanzatext;
-
-	my $desc = "package changelog, entry no.$.";
-	open my $stanzafh, "<", \$stanzatext or die;
-	my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
 	$clogp //= $thisstanza;
 
 	printdebug "import clog $thisstanza->{version} $desc...\n";
@@ -2383,7 +2330,7 @@ sub generate_commits_from_dsc () {
 	# version).  Then it remains to choose between the physically
 	# last entry in the file, and the one with the lowest version
 	# number.  If these are not the same, we guess that the
-	# versions were created in a non-monotic order rather than
+	# versions were created in a non-monotonic order rather than
 	# that the changelog entries have been misordered.
 
 	printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
@@ -2392,9 +2339,7 @@ sub generate_commits_from_dsc () {
 	$r1clogp = $thisstanza;
 
 	printdebug "import clog $r1clogp->{version} becomes r1\n";
-    }
-    die $! if CLOGS->error;
-    close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
+    };
 
     $clogp or fail "package changelog has no entries!";
 
@@ -2635,7 +2580,7 @@ sub ensure_we_have_orig () {
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	next unless is_orig_file_in_dsc($f, \@dfi);
-	complete_file_from_dsc('..', $fi)
+	complete_file_from_dsc($buildproductsdir, $fi)
 	    or next;
     }
 }
@@ -3812,11 +3757,11 @@ sub quiltify_nofix_bail ($$) {
 }
 
 sub commit_quilty_patch () {
-    my $output = cmdoutput @git, qw(status --porcelain);
+    my $output = cmdoutput @git, qw(status --ignored --porcelain);
     my %adds;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
-	if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) {
+	if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
 	    $adds{$1}++;
 	}
     }
@@ -4053,7 +3998,7 @@ sub splitbrain_pseudomerge ($$$$) {
         $@ =~ s/^\n//; chomp $@;
 	print STDERR <<END;
 $@
-| Not fast forward; maybe --overwrite is needed, see dgit(1)
+| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).
 END
 	finish -1;
     }
@@ -5318,7 +5263,7 @@ END
 	print SERIES "\n" or die $! unless $newline eq "\n";
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
-        runcmd @git, qw(add -- debian/patches/series), $gipatch;
+        runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
         commit_admin <<END
 Commit patch to update .gitignore
 
@@ -5706,8 +5651,9 @@ sub quilt_fixup_linkorigs ($$) {
     my ($upstreamversion, $fn) = @_;
     # calls $fn->($leafname);
 
-    foreach my $f (<$maindir/../*>) { #/){
-	my $b=$f; $b =~ s{.*/}{};
+    opendir QFD, bpd_abs();
+    while ($!=0, defined(my $b = readdir QFD)) {
+	my $f = bpd_abs()."/".$b;
 	{
 	    local ($debuglevel) = $debuglevel-1;
 	    printdebug "QF linkorigs $b, $f ?\n";
@@ -5717,6 +5663,8 @@ sub quilt_fixup_linkorigs ($$) {
 	link_ltarget $f, $b or die "$b $!";
         $fn->($b);
     }
+    die "$buildproductsdir: $!" if $!;
+    closedir QFD;
 }
 
 sub quilt_fixup_delete_pc () {
@@ -5978,7 +5926,7 @@ sub quilt_fixup_multipatch ($$$) {
 failed to apply your git tree's patch stack (from debian/patches/) to
  the corresponding upstream tarball(s).  Your source tree and .orig
  are probably too inconsistent.  dgit can only fix up certain kinds of
- anomaly (depending on the quilt mode).  See --quilt= in dgit(1).
+ anomaly (depending on the quilt mode).  Please see --quilt= in dgit(1).
 END
     }
 
@@ -6283,15 +6231,16 @@ sub massage_dbp_args ($;$) {
     return $r;
 }
 
-sub in_parent (&) {
+sub in_bpd (&) {
     my ($fn) = @_;
     my $wasdir = must_getcwd();
-    changedir "..";
+    changedir $buildproductsdir;
     $fn->();
     changedir $wasdir;
 }    
 
-sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
+# this sub must run with CWD=$buildproductsdir (eg in in_bpd)
+sub postbuild_mergechanges ($) {
     my ($msg_if_onlyone) = @_;
     # If there is only one .changes file, fail with $msg_if_onlyone,
     # or if that is undef, be a no-op.
@@ -6333,7 +6282,7 @@ END
 sub midbuild_checkchanges () {
     my $pat = changespat $version;
     return if $rmchanges;
-    my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
+    my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
     @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
     fail <<END
 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
@@ -6350,7 +6299,7 @@ sub midbuild_checkchanges_vanilla ($) {
 sub postbuild_mergechanges_vanilla ($) {
     my ($wantsrc) = @_;
     if ($wantsrc == 1) {
-	in_parent {
+	in_bpd {
 	    postbuild_mergechanges(undef);
 	};
     } else {
@@ -6392,7 +6341,7 @@ sub cmd_gbp_build {
     # orig is absent.
     my $upstreamversion = upstreamversion $version;
     my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
-    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
+    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
 
     if ($gbp_make_orig) {
 	clean_tree();
@@ -6464,7 +6413,7 @@ sub build_source {
     build_prep();
     $sourcechanges = changespat $version,'source';
     if (act_local()) {
-	unlink "../$sourcechanges" or $!==ENOENT
+	unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
 	    or fail "remove $sourcechanges: $!";
     }
     $dscfn = dscfn($version);
@@ -6481,7 +6430,7 @@ sub build_source {
               ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
                $f eq srcfn($version, $&));
             printdebug "source copy, found $f - renaming\n";
-            rename "$playground/$f", "../$f" or $!==ENOENT
+            rename "$playground/$f", "$buildproductsdir/$f" or $!==ENOENT
               or fail "put in place new source file ($f): $!";
         }
     } else {
@@ -6493,7 +6442,7 @@ sub build_source {
     }
     runcmd_ordryrun_local qw(sh -ec),
       'exec >$1; shift; exec "$@"','x',
-      "../$sourcechanges",
+      "$buildproductsdir/$sourcechanges",
       @dpkggenchanges, qw(-S), changesopts();
 }
 
@@ -6508,7 +6457,7 @@ sub cmd_build_source {
 sub cmd_sbuild {
     build_source();
     midbuild_checkchanges();
-    in_parent {
+    in_bpd {
 	if (act_local()) {
 	    stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
 	    stat_exists $sourcechanges
@@ -6517,7 +6466,7 @@ sub cmd_sbuild {
 	runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
     };
     maybe_unapply_patches_again();
-    in_parent {
+    in_bpd {
 	postbuild_mergechanges(<<END);
 perhaps you need to pass -A ?  (sbuild's default is to build only
 arch-specific binaries; dgit 1.4 used to override that.)
@@ -6653,7 +6602,7 @@ END
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
-	my $here = "../$f";
+	my $here = "$buildproductsdir/$f";
 	if (lstat $here) {
 	    next if stat $here;
 	    fail "lstat $here works but stat gives $! !";
@@ -7125,6 +7074,11 @@ sub parseopts_late_defaults () {
 	badcfg "unknown clean-mode \`$cleanmode'" unless
 	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
     }
+
+    $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
+    $buildproductsdir //= '..';
+    $bpd_glob = $buildproductsdir;
+    $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
 }
 
 if ($ENV{$fakeeditorenv}) {