X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=fa713fa5c5d8b4aff2070f132c5342ed9f5dab7c;hb=7db38cc31a461e0117d4d5775ffa98690c6a1eba;hp=af62eb503534920cea40a43ee3c10743026f6aca;hpb=be4d76851f775f1863ff597ddb7adf171d8bb583;p=dgit.git

diff --git a/dgit b/dgit
index af62eb50..fa713fa5 100755
--- a/dgit
+++ b/dgit
@@ -4963,15 +4963,21 @@ sub cmd_clean () {
     maybe_unapply_patches_again();
 }
 
-sub build_prep () {
+sub build_prep_early () {
+    our $build_prep_early_done //= 0;
+    return if $build_prep_early_done++;
     notpushing();
     badusage "-p is not allowed when building" if defined $package;
-    check_not_dirty();
-    clean_tree();
     my $clogp = parsechangelog();
     $isuite = getfield $clogp, 'Distribution';
     $package = getfield $clogp, 'Source';
     $version = getfield $clogp, 'Version';
+    check_not_dirty();
+}
+
+sub build_prep () {
+    build_prep_early();
+    clean_tree();
     build_maybe_quilt_fixup();
     if ($rmchanges) {
 	my $pat = changespat $version;
@@ -5170,6 +5176,24 @@ sub pre_gbp_build {
 }
 
 sub cmd_gbp_build {
+    build_prep_early();
+
+    # gbp can make .origs out of thin air.  In my tests it does this
+    # even for a 1.0 format package, with no origs present.  So I
+    # guess it keys off just the version number.  We don't know
+    # exactly what .origs ought to exist, but let's assume that we
+    # should run gbp if: the version has an upstream part and the main
+    # orig is absent.
+    my $upstreamversion = upstreamversion $version;
+    my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
+    my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
+
+    if ($gbp_make_orig) {
+	clean_tree();
+	$cleanmode = 'none'; # don't do it again
+	$need_split_build_invocation = 1;
+    }
+
     my @dbp = @dpkgbuildpackage;
 
     my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
@@ -5185,6 +5209,24 @@ sub cmd_gbp_build {
 
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
+    if ($gbp_make_orig) {
+	ensuredir '.git/dgit';
+	my $ok = '.git/dgit/origs-gen-ok';
+	unlink $ok or $!==&ENOENT or die $!;
+	my @origs_cmd = @cmd;
+	push @origs_cmd, qw(--git-cleaner=true);
+	push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
+	push @origs_cmd, @ARGV;
+	if (act_local()) {
+	    debugcmd @origs_cmd;
+	    system @origs_cmd;
+	    do { local $!; stat_exists $ok; }
+		or failedcmd @origs_cmd;
+	} else {
+	    dryrun_report @origs_cmd;
+	}
+    }
+
     if ($wantsrc > 0) {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;