[anaconda][master/f23-branch][PATCH] Correctly check return code when running rpm from makeupdates

Chris Lumens clumens at redhat.com
Thu Aug 13 13:16:04 UTC 2015


> Otherwise locally available packages will be ignored when fetching
> new requires.
> ---
>  scripts/makeupdates | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/makeupdates b/scripts/makeupdates
> index b288bc0..505b3b2 100755
> --- a/scripts/makeupdates
> +++ b/scripts/makeupdates
> @@ -754,9 +754,9 @@ def remove_local_packages(packages, arch, release_id, added_rpms):
>                                  '%{NAME} %{VERSION} %{RELEASE}', rpm_path],
>                                  stdout=subprocess.PIPE,
>                                  stderr=None)
> -        output, rc = proc.communicate()
> +        output = proc.communicate()[0]
>          output = output.decode("utf-8")
> -        if rc != 0:
> +        if proc.returncode != 0:
>              continue
>          name, version, release = output.split()
>          # get the build number and release id

Looks good.

- Chris


More information about the anaconda-patches mailing list