[f18-beta2-branch] show error when rsync fails (#868755)

Brian C. Lane bcl at redhat.com
Tue Nov 20 14:04:03 UTC 2012


From: "Brian C. Lane" <bcl at redhat.com>

NOTE: Take 2. Or is it 3?
---
 pyanaconda/packaging/livepayload.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index 507c2a5..ecade1a 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -108,14 +108,16 @@ class LiveImagePayload(ImagePayload):
             rc = iutil.execWithRedirect(cmd, args,
                                         stderr="/dev/tty5", stdout="/dev/tty5")
         except (OSError, RuntimeError) as e:
+            msg = None
             err = str(e)
             log.error(err)
         else:
             err = None
-            log.error("%s exited with code %d" % (cmd, rc))
+            msg = "%s exited with code %d" % (cmd, rc)
+            log.info(msg)
 
         if err or rc == 12:
-            exn = PayloadInstallError(err)
+            exn = PayloadInstallError(err or msg)
             if errorHandler.cb(exn) == ERROR_RAISE:
                 raise exn
 
-- 
1.7.11.7



More information about the anaconda-patches mailing list