Sfoglia il codice sorgente

Even if safe, revert r541 for now, as the RMs have not replied to the
approval request. This is going in the next upload, though.

Guillem Jover 20 anni fa
parent
commit
0905829aca
3 ha cambiato i file con 4 aggiunte e 13 eliminazioni
  1. 0 5
      ChangeLog
  2. 0 3
      debian/changelog
  3. 4 5
      scripts/controllib.pl

+ 0 - 5
ChangeLog

@@ -4,11 +4,6 @@
 	file. State that the languages should be listed alphabetically in
 	file. State that the languages should be listed alphabetically in
 	debian/changelog.
 	debian/changelog.
 
 
-2006-10-03  Brendan O'Dea  <bod@debian.org>
-
-	* scripts/controllib.pl (subprocerr): Require POSIX for WIFEXITED,
-	WEXITSTATUS, WIFSIGNALED and WTERMSIG.
-
 2006-09-27  Guillem Jover  <guillem@debian.org>
 2006-09-27  Guillem Jover  <guillem@debian.org>
 
 
 	* m4/compiler.m4: Add a new line at the end of the file, to cope with
 	* m4/compiler.m4: Add a new line at the end of the file, to cope with

+ 0 - 3
debian/changelog

@@ -16,9 +16,6 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
     read contains nul character" warning.
     read contains nul character" warning.
     Closes: #376351, #375749, #376724, #377279
     Closes: #376351, #375749, #376724, #377279
 
 
-  [ Brendan O'Dea ]
-  * Require POSIX inside subprocerr in controllib.pl. Closes: #390636
-
   [ Added dpkg Translations ]
   [ Added dpkg Translations ]
   * Dzongkha (Kinley Tshering)
   * Dzongkha (Kinley Tshering)
 
 

+ 4 - 5
scripts/controllib.pl

@@ -430,13 +430,12 @@ sub warnerror { if ($warnable_error) { &warn( @_ ); } else { &error( @_ ); } }
 
 
 sub subprocerr {
 sub subprocerr {
     local ($p) = @_;
     local ($p) = @_;
-    require POSIX;
-    if (POSIX::WIFEXITED($?)) {
+    if (WIFEXITED($?)) {
         die sprintf(_g("%s: failure: %s gave error exit status %s"),
         die sprintf(_g("%s: failure: %s gave error exit status %s"),
-                    $progname, $p, POSIX::WEXITSTATUS($?))."\n";
-    } elsif (POSIX::WIFSIGNALED($?)) {
+                    $progname, $p, WEXITSTATUS($?))."\n";
+    } elsif (WIFSIGNALED($?)) {
         die sprintf(_g("%s: failure: %s died from signal %s"),
         die sprintf(_g("%s: failure: %s died from signal %s"),
-                    $progname, $p, POSIX::WTERMSIG($?))."\n";
+                    $progname, $p, WTERMSIG($?))."\n";
     } else {
     } else {
         die sprintf(_g("%s: failure: %s failed with unknown exit code %d"),
         die sprintf(_g("%s: failure: %s failed with unknown exit code %d"),
                     $progname, $p, $?)."\n";
                     $progname, $p, $?)."\n";