[PATCH] Ransom notes can be either PNGs or JPGs.

Brian C. Lane bcl at redhat.com
Tue Apr 9 21:12:47 UTC 2013


On Tue, Apr 09, 2013 at 01:04:18PM -0400, Chris Lumens wrote:
> ---
>  pyanaconda/ui/gui/hubs/progress.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
> index 3cf2a44..e28c6a3 100644
> --- a/pyanaconda/ui/gui/hubs/progress.py
> +++ b/pyanaconda/ui/gui/hubs/progress.py
> @@ -147,12 +147,12 @@ class ProgressHub(Hub):
>          # We first look for rnotes in paths containing the language, then in
>          # directories without the language component.  You know, just in case.
>          langs = expand_langs(os.environ["LANG"]) + [""]
> -        paths = ["/tmp/updates/pixmaps/rnotes/%s/*.png",
> -                 "/tmp/product/pixmaps/rnotes/%s/*.png",
> -                 "/usr/share/anaconda/pixmaps/rnotes/%s/*.png"]
> +        paths = ["/tmp/updates/pixmaps/rnotes/%s/",
> +                 "/tmp/product/pixmaps/rnotes/%s/",
> +                 "/usr/share/anaconda/pixmaps/rnotes/%s/"]
>  
>          for (l, d) in itertools.product(langs, paths):
> -            pixmaps = glob.glob(d % l)
> +            pixmaps = glob.glob((d % l) + "*.png") + glob.glob((d % l) + "*.jpg")
>              if len(pixmaps) > 0:
>                  return pixmaps
>  
> -- 
> 1.8.1.2
> 
> _______________________________________________
> anaconda-patches mailing list
> anaconda-patches at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 482 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20130409/99b02e48/attachment.sig>


More information about the anaconda-patches mailing list