[f18-beta2-branch] only raise rsync error on error 12 (#868755)
Jesse Keating
jkeating at redhat.com
Mon Nov 19 21:51:33 UTC 2012
On 11/19/2012 01:17 PM, Brian C. Lane wrote:
> From: "Brian C. Lane" <bcl at redhat.com>
>
> ---
> pyanaconda/packaging/livepayload.py | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
> index 0ef1265..507c2a5 100644
> --- a/pyanaconda/packaging/livepayload.py
> +++ b/pyanaconda/packaging/livepayload.py
> @@ -109,14 +109,12 @@ class LiveImagePayload(ImagePayload):
> stderr="/dev/tty5", stdout="/dev/tty5")
> except (OSError, RuntimeError) as e:
> err = str(e)
> + log.error(err)
> else:
> - if rc != 0:
> - err = "%s exited with code %d" % (cmd, rc)
> - log.error(err)
> - else:
> - err = None
> + err = None
> + log.error("%s exited with code %d" % (cmd, rc))
>
> - if err:
> + if err or rc == 12:
> exn = PayloadInstallError(err)
> if errorHandler.cb(exn) == ERROR_RAISE:
> raise exn
>
ACK
--
Jesse Keating
Fedora -- FreedomĀ² is a feature!
More information about the anaconda-patches
mailing list