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

Chris Lumens clumens at redhat.com
Tue Apr 9 17:04:18 UTC 2013


---
 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



More information about the anaconda-patches mailing list