summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2012-07-02 11:55:00 -0400
committerChris Lumens <clumens@redhat.com>2012-07-02 11:55:00 -0400
commit75fe7323ed7fa20b816b313a041d771934b009f7 (patch)
treef50cf6435e9fec228d5fbd12183d2e4ad63be5b2 /scripts
parent66199a988d2efa32933590dd6b450b3258939952 (diff)
downloadanaconda-75fe7323ed7fa20b816b313a041d771934b009f7.tar.gz
anaconda-75fe7323ed7fa20b816b313a041d771934b009f7.tar.xz
anaconda-75fe7323ed7fa20b816b313a041d771934b009f7.zip
Don't put all .ui files into a subdirectory of an updates.img.
I'd like to be able to make more top-level .ui files, for stuff that is used throughout anaconda. These shouldn't end up in a gui/ directory, because nothing will be looking for them there.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/makeupdates9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/makeupdates b/scripts/makeupdates
index 1eb3629ad..398005917 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -134,10 +134,13 @@ def copyUpdatedFiles(tag, updates, cwd):
continue
if file.endswith('.ui'):
- # UI files should go under ui/<dir> where dir is the directory
- # above the file.ui
+ # Some UI files should go under ui/<dir> where dir is the
+ # directory above the file.ui
uidir = os.path.dirname(file).split(os.path.sep)[-1]
- install_to_dir(file, os.path.join(tmpupdates, "ui", uidir))
+ if uidir in ["hubs", "spokes"]:
+ install_to_dir(file, os.path.join(tmpupdates, "ui", uidir))
+ else:
+ install_to_dir(file, os.path.join(tmpupdates, "ui"))
elif file.startswith('pyanaconda/'):
# pyanaconda stuff goes into /tmp/updates/[path]
dirname = os.path.join(tmpupdates, os.path.dirname(file))