Просмотр исходного кода

dpkg-buildpackage: Adapt $signsource value wrt whether source is built

Instead of checking if we are actually building any source at all,
just fold the check into the $signsource value at setup time.
Guillem Jover лет назад: 12
Родитель
Сommit
2ce819ef2d
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      scripts/dpkg-buildpackage.pl

+ 6 - 3
scripts/dpkg-buildpackage.pl

@@ -363,6 +363,10 @@ if (not $signcommand) {
     $signchanges = 0;
 }
 
+if ($signsource && build_binaryonly) {
+    $signsource = 0;
+}
+
 # Preparation of environment stops here
 
 (my $sversion = $version) =~ s/^\d+://;
@@ -510,13 +514,12 @@ chdir($dir) or syserr("chdir $dir");
 
 print "$Dpkg::PROGNAME: $srcmsg\n";
 
-if ($signpause &&
-    ($signchanges || (($include & BUILD_SOURCE) && $signsource))) {
+if ($signpause && ($signchanges || $signsource)) {
     print _g("Press the return key to start signing process\n");
     getc();
 }
 
-if ($signsource && ($include & BUILD_SOURCE) && signfile("$pv.dsc")) {
+if ($signsource && signfile("$pv.dsc")) {
     error(_g('failed to sign .dsc and .changes file'));
 }
 if ($signchanges && signfile("$pva.changes")) {