chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sbuild:: check that we have the right number of .changes files
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index f4e2abfb4c9998c5002fa6bd729cbd0ba7a377e3..32eaa2a830bc68cdea02fd7e7077af8593edc384 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-75,7
+75,7
@@
our (@curl) = qw(curl -f);
our (@dput) = qw(dput);
our (@debsign) = qw(debsign);
our (@gpg) = qw(gpg);
our (@dput) = qw(dput);
our (@debsign) = qw(debsign);
our (@gpg) = qw(gpg);
-our (@sbuild) = qw(sbuild
-A
);
+our (@sbuild) = qw(sbuild);
our (@ssh) = 'ssh';
our (@dgit) = qw(dgit);
our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
our (@ssh) = 'ssh';
our (@dgit) = qw(dgit);
our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
@@
-155,7
+155,7
@@
END {
local ($?);
foreach my $f (@end) {
eval { $f->(); };
local ($?);
foreach my $f (@end) {
eval { $f->(); };
-
warn
"$us: cleanup: $@" if length $@;
+
print STDERR
"$us: cleanup: $@" if length $@;
}
};
}
};
@@
-1706,7
+1706,7
@@
sub clone ($) {
canonicalise_suite();
badusage "dry run makes no sense with clone" unless act_local();
my $hasgit = check_for_git();
canonicalise_suite();
badusage "dry run makes no sense with clone" unless act_local();
my $hasgit = check_for_git();
- mkdir $dstdir or
die "$dstdir
$!";
+ mkdir $dstdir or
fail "create \`$dstdir':
$!";
changedir $dstdir;
runcmd @git, qw(init -q);
my $giturl = access_giturl(1);
changedir $dstdir;
runcmd @git, qw(init -q);
my $giturl = access_giturl(1);
@@
-1751,7
+1751,14
@@
sub pull () {
}
sub check_not_dirty () {
}
sub check_not_dirty () {
+ foreach my $f (qw(local-options local-patch-header)) {
+ if (stat_exists "debian/source/$f") {
+ fail "git tree contains debian/source/$f";
+ }
+ }
+
return if $ignoredirty;
return if $ignoredirty;
+
my @cmd = (@git, qw(diff --quiet HEAD));
debugcmd "+",@cmd;
$!=0; $?=0; system @cmd;
my @cmd = (@git, qw(diff --quiet HEAD));
debugcmd "+",@cmd;
$!=0; $?=0; system @cmd;
@@
-1761,10
+1768,6
@@
sub check_not_dirty () {
} else {
failedcmd @cmd;
}
} else {
failedcmd @cmd;
}
-
- if (stat_exists "debian/source/local-options") {
- fail "git tree contains debian/source/local-options";
- }
}
sub commit_admin ($) {
}
sub commit_admin ($) {
@@
-2080,7
+2083,7
@@
END
sign_changes $changesfile;
}
sign_changes $changesfile;
}
- supplementary_message(<<
'END'
);
+ supplementary_message(<<
END
);
Push failed, while uploading package(s) to the archive server.
You can retry the upload of exactly these same files with dput of:
$changesfile
Push failed, while uploading package(s) to the archive server.
You can retry the upload of exactly these same files with dput of:
$changesfile
@@
-2128,7
+2131,13
@@
sub cmd_clone {
return if $!==&ENOENT;
die "chdir $cwd_remove: $!";
}
return if $!==&ENOENT;
die "chdir $cwd_remove: $!";
}
- rmtree($dstdir) or die "remove $dstdir: $!\n";
+ if (stat $dstdir) {
+ rmtree($dstdir) or die "remove $dstdir: $!\n";
+ } elsif (!grep { $! == $_ }
+ (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
+ } else {
+ print STDERR "check whether to remove $dstdir: $!\n";
+ }
};
}
};
}
@@
-2798,6
+2807,8
@@
sub quilt_fixup_delete_pc () {
sub quilt_fixup_singlepatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
sub quilt_fixup_singlepatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
+ progress "starting quiltify (single-debian-patch)";
+
# dpkg-source --commit generates new patches even if
# single-debian-patch is in debian/source/options. In order to
# get it to generate debian/patches/debian-changes, it is
# dpkg-source --commit generates new patches even if
# single-debian-patch is in debian/source/options. In order to
# get it to generate debian/patches/debian-changes, it is
@@
-2823,6
+2834,8
@@
sub quilt_fixup_singlepatch ($$$) {
sub quilt_fixup_multipatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
sub quilt_fixup_multipatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
+ progress "starting quiltify (multiple patches, $quilt_mode mode)";
+
# Our objective is:
# - honour any existing .pc in case it has any strangeness
# - determine the git commit corresponding to the tip of
# Our objective is:
# - honour any existing .pc in case it has any strangeness
# - determine the git commit corresponding to the tip of
@@
-3096,11
+3109,11
@@
sub build_source {
$sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
$dscfn = dscfn($version);
if ($cleanmode eq 'dpkg-source') {
$sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
$dscfn = dscfn($version);
if ($cleanmode eq 'dpkg-source') {
- runcmd_ordryrun_local
(@dpkgbuildpackage, qw(-us -uc -S)
),
- changesopts();
+ runcmd_ordryrun_local
@dpkgbuildpackage, qw(-us -uc -S
),
+
changesopts();
} elsif ($cleanmode eq 'dpkg-source-d') {
} elsif ($cleanmode eq 'dpkg-source-d') {
- runcmd_ordryrun_local
(@dpkgbuildpackage, qw(-us -uc -S -d)
),
- changesopts();
+ runcmd_ordryrun_local
@dpkgbuildpackage, qw(-us -uc -S -d
),
+
changesopts();
} else {
my $pwd = must_getcwd();
my $leafdir = basename $pwd;
} else {
my $pwd = must_getcwd();
my $leafdir = basename $pwd;
@@
-3133,14
+3146,14
@@
sub cmd_sbuild {
unlink $cf or fail "remove $cf: $!";
}
}
unlink $cf or fail "remove $cf: $!";
}
}
- runcmd_ordryrun_local @sbuild,
@ARGV, qw(-d), $isuite
, $dscfn;
+ runcmd_ordryrun_local @sbuild,
qw(-d), $isuite, @ARGV
, $dscfn;
my @changesfiles = glob $pat;
@changesfiles = sort {
($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
or $a cmp $b
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
my @changesfiles = glob $pat;
@changesfiles = sort {
($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
or $a cmp $b
} @changesfiles;
fail "wrong number of different changes files (@changesfiles)"
- unless @changesfiles;
+ unless @changesfiles
==2
;
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
runcmd_ordryrun_local @mergechanges, @changesfiles;
my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
if (act_local()) {
@@
-3154,6
+3167,8
@@
sub cmd_quilt_fixup {
my $clogp = parsechangelog();
$version = getfield $clogp, 'Version';
$package = getfield $clogp, 'Source';
my $clogp = parsechangelog();
$version = getfield $clogp, 'Version';
$package = getfield $clogp, 'Source';
+ check_not_dirty();
+ clean_tree();
build_maybe_quilt_fixup();
}
build_maybe_quilt_fixup();
}