|
 |
a2f18f |
From 53e51059c4e95fab6c3601952069191343fe92b3 Mon Sep 17 00:00:00 2001
|
|
|
a2f18f |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
a2f18f |
Date: Mon, 20 Jul 2015 10:31:46 -0600
|
|
|
a2f18f |
Subject: [PATCH 28/30] Ticket #48224 - redux 2 - logconv.pl should handle
|
|
|
a2f18f |
*.tar.xz, *.txz, *.xz log files
|
|
|
a2f18f |
|
|
|
a2f18f |
https://fedorahosted.org/389/ticket/48224
|
|
|
a2f18f |
Reviewed by: nhosoi (Thanks!)
|
|
|
a2f18f |
Branch: 389-ds-base-1.3.4
|
|
|
a2f18f |
Fix Description: Use $? instead of $! to get pipe errors.
|
|
|
a2f18f |
Platforms tested: Fedora 21, RHEL 7.2 candidate
|
|
|
a2f18f |
Flag Day: no
|
|
|
a2f18f |
Doc impact: no
|
|
|
a2f18f |
|
|
|
a2f18f |
(cherry picked from commit 29043c5716a1bc8364689d518cb4e35722eaaf77)
|
|
|
a2f18f |
(cherry picked from commit 0e31d818366e846f45c60b2c24bdb8026a82c048)
|
|
|
a2f18f |
---
|
|
|
a2f18f |
ldap/admin/src/logconv.pl | 6 +++---
|
|
|
a2f18f |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
a2f18f |
|
|
|
a2f18f |
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
|
|
|
a2f18f |
index 0038a03..3113f8a 100755
|
|
|
a2f18f |
--- a/ldap/admin/src/logconv.pl
|
|
|
a2f18f |
+++ b/ldap/admin/src/logconv.pl
|
|
|
a2f18f |
@@ -437,9 +437,9 @@ sub doUncompress {
|
|
|
a2f18f |
# so use the xz command directly
|
|
|
a2f18f |
# NOTE: This doesn't work if the argument is a file handle e.g. from
|
|
|
a2f18f |
# Archive::Tar
|
|
|
a2f18f |
- $! = 0; # clear
|
|
|
a2f18f |
- if (!open($TARFH, "xz -dc $_ |") or $!) {
|
|
|
a2f18f |
- openFailed($!, $_);
|
|
|
a2f18f |
+ $? = 0; # clear
|
|
|
a2f18f |
+ if (!open($TARFH, "xz -dc $_ |") or $?) {
|
|
|
a2f18f |
+ openFailed($?, $_);
|
|
|
a2f18f |
return;
|
|
|
a2f18f |
}
|
|
|
a2f18f |
} else {
|
|
|
a2f18f |
--
|
|
|
a2f18f |
1.9.3
|
|
|
a2f18f |
|