From: Guillem Jover <guillem@debian.org>
Date: Wed, 11 Oct 2006 23:51:45 +0000 (+0000)
Subject: Even if safe, revert r541 for now, as the RMs have not replied to the
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0905829aca36445a934c3c391264bf0382ee6bfa;p=dpkg

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.
---

diff --git a/ChangeLog b/ChangeLog
index cb94d671..7405a69d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,11 +4,6 @@
 	file. State that the languages should be listed alphabetically in
 	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>
 
 	* m4/compiler.m4: Add a new line at the end of the file, to cope with
diff --git a/debian/changelog b/debian/changelog
index 5ef6006c..7f2b65c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,6 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
     read contains nul character" warning.
     Closes: #376351, #375749, #376724, #377279
 
-  [ Brendan O'Dea ]
-  * Require POSIX inside subprocerr in controllib.pl. Closes: #390636
-
   [ Added dpkg Translations ]
   * Dzongkha (Kinley Tshering)
 
diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index d5705327..ff3d3747 100755
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -430,13 +430,12 @@ sub warnerror { if ($warnable_error) { &warn( @_ ); } else { &error( @_ ); } }
 
 sub subprocerr {
     local ($p) = @_;
-    require POSIX;
-    if (POSIX::WIFEXITED($?)) {
+    if (WIFEXITED($?)) {
         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"),
-                    $progname, $p, POSIX::WTERMSIG($?))."\n";
+                    $progname, $p, WTERMSIG($?))."\n";
     } else {
         die sprintf(_g("%s: failure: %s failed with unknown exit code %d"),
                     $progname, $p, $?)."\n";