chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: new-upstream: Fix error message for new version with bad syntax
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index dfe0d155d4d1e6401d63bad0291b61934834f810..4e43d21ddf9d07583bb64d69123ae54745b83faa 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-824,7
+824,8
@@
sub access_forpush () {
}
sub pushing () {
}
sub pushing () {
- die "$access_forpush ?" if ($access_forpush // 1) ne 1;
+ confess 'internal error '.Dumper($access_forpush)," ?" if
+ defined $access_forpush and !$access_forpush;
badcfg "pushing but distro is configured readonly"
if access_forpush_config() eq '0';
$access_forpush = 1;
badcfg "pushing but distro is configured readonly"
if access_forpush_config() eq '0';
$access_forpush = 1;
@@
-4439,7
+4440,8
@@
END
responder_send_command("param isuite $isuite");
responder_send_command("param tagformat $tagformat");
if (defined $maintviewhead) {
responder_send_command("param isuite $isuite");
responder_send_command("param tagformat $tagformat");
if (defined $maintviewhead) {
- die unless ($protovsn//4) >= 4;
+ confess "internal error (protovsn=$protovsn)"
+ if defined $protovsn and $protovsn < 4;
responder_send_command("param maint-view $maintviewhead");
}
responder_send_command("param maint-view $maintviewhead");
}
@@
-6292,6
+6294,10
@@
sub postbuild_mergechanges_vanilla ($) {
sub cmd_build {
build_prep_early();
sub cmd_build {
build_prep_early();
+ $buildproductsdir eq '..' or print STDERR <<END;
+$us: warning: build-products-dir set, but not supported by dgit build
+$us: warning: things may go wrong or files may go to the wrong place
+END
my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
my $wantsrc = massage_dbp_args \@dbp;
build_prep($wantsrc);
my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
my $wantsrc = massage_dbp_args \@dbp;
build_prep($wantsrc);
@@
-6478,14
+6484,6
@@
sub cmd_push_source {
dopush();
}
dopush();
}
-sub cmd_sbuild {
- build_prep_early();
- binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
-perhaps you need to pass -A ? (sbuild's default is to build only
-arch-specific binaries; dgit 1.4 used to override that.)
-END
-}
-
sub binary_builder {
my ($bbuilder, $pbmc_msg, @args) = @_;
build_prep(WANTSRC_SOURCE);
sub binary_builder {
my ($bbuilder, $pbmc_msg, @args) = @_;
build_prep(WANTSRC_SOURCE);
@@
-6505,6
+6503,14
@@
sub binary_builder {
};
}
};
}
+sub cmd_sbuild {
+ build_prep_early();
+ binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn);
+perhaps you need to pass -A ? (sbuild's default is to build only
+arch-specific binaries; dgit 1.4 used to override that.)
+END
+}
+
sub pbuilder ($) {
my ($pbuilder) = @_;
build_prep_early();
sub pbuilder ($) {
my ($pbuilder) = @_;
build_prep_early();
@@
-7049,8
+7055,8
@@
sub check_env_sanity () {
foreach my $name (qw(PIPE CHLD)) {
my $signame = "SIG$name";
my $signum = eval "POSIX::$signame" // die;
foreach my $name (qw(PIPE CHLD)) {
my $signame = "SIG$name";
my $signum = eval "POSIX::$signame" // die;
- ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
-
die "$signame is set to something other than SIG_DFL\n"
;
+ die "$signame is set to something other than SIG_DFL\n"
+
if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT'
;
$blocked->ismember($signum) and
die "$signame is blocked\n";
}
$blocked->ismember($signum) and
die "$signame is blocked\n";
}