summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xscripts/pkgorder32
2 files changed, 19 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index f644571bb..7e36ad3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-10-02 Jeremy Katz <katzj@redhat.com>
+ * scripts/pkgorder (usage): Use group ids -- the display name can
+ (... and has) changed. This should fix our # of cd problem (#206778)
+
* yuminstall.py (YumSorter.tsCheck): Ensure that we do eventually
depcheck on redhat-lsb (#201222)
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 6895f03a8..fe3311eef 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -159,27 +159,27 @@ if __name__ == "__main__":
ds = PackageOrderer(arch=arch)
ds.setup(fn=config, excludes=options.excludeList, root = testpath)
- addGroups(ds, ["Core", "Base", "Text-based Internet"])
+ addGroups(ds, ["core", "base", "text-internet"])
- addGroups(ds, ["X Window System", "Dialup Networking Support",
- "Graphical Internet", "Editors",
- "Graphics", "GNOME Desktop Environment", "Sound and Video",
- "Printing Support", "Dialup Networking Support"])
+ addGroups(ds, ["base-x", "dial-up",
+ "graphical-internet", "editors",
+ "graphics", "gnome-desktop", "sound-and-video",
+ "printing"])
- addGroups(ds, ["Office/Productivity", "Engineering and Scientific",
- "Authoring and Publishing", "Games and Entertainment"])
+ addGroups(ds, ["office", "engineering-and-scientific",
+ "authoring-and-publishing", "games"])
- addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
- "Server Configuration Tools", "DNS Name Server",
- "Windows File Server", "Administration Tools"])
+ addGroups(ds, ["web-server", "ftp-server", "sql-server",
+ "mysql", "server-cfg", "dns-server",
+ "smb-server", "admin-tools"])
- addGroups(ds, ["KDE (K Desktop Environment)", "Development Tools",
- "GNOME Software Development", "Eclipse",
- "Java Development", "KDE Software Development",
- "PostgreSQL Database", "Mail Server",
- "Legacy Network Server"])
+ addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
+ "gnome-software-development", "eclipse",
+ "x-software-development",
+ "java-development", "kde-software-development",
+ "mail-server", "legacy-network-server"])
- addGroups(ds, ["News Server", "Legacy Software Development"])
+ addGroups(ds, ["news-server", "legacy-software-development"])
#Everthing else but kernels - don't depsolve
for po in ds.pkgSack.returnPackages():