From 9e9f0a8beeaac18cde7096e3d5344e33a25c3e89 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 17 May 2006 21:57:04 +0000
Subject: [PATCH] - runtime fixes

Changed files:
    anaconda-errorhandling.patch -> 1.1
    anaconda-pkgorder.patch -> 1.1
---
 anaconda-errorhandling.patch | 39 +++++++++++++++++++++++++++
 anaconda-pkgorder.patch      | 51 ++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 anaconda-errorhandling.patch
 create mode 100644 anaconda-pkgorder.patch

diff --git a/anaconda-errorhandling.patch b/anaconda-errorhandling.patch
new file mode 100644
index 0000000..34a3ba9
--- /dev/null
+++ b/anaconda-errorhandling.patch
@@ -0,0 +1,39 @@
+--- anaconda-11.0.5/scripts/splittree.py	2005-05-16 19:11:52.000000000 +0300
++++ /usr/lib/anaconda-runtime/splittree.py	2006-05-18 00:47:56.275877225 +0300
+@@ -36,7 +36,11 @@
+         _ts = rpm.TransactionSet()
+         _ts.setVSFlags(-1)
+     fd = os.open(pkgfile, os.O_RDONLY)
+-    h = _ts.hdrFromFdno(fd)
++    try:
++        h = _ts.hdrFromFdno(fd)
++    except:
++        raise RuntimeError, 'rpm: %s %s' % (pkgfile, sys.exc_info()[1])
++
+     os.close(fd)
+     return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'],
+                                h['arch'])
+@@ -217,7 +221,10 @@
+ 
+                 # now create the dirs for disc1
+                 for j in range(0, len(dirlist)):
+-                    os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
++                    try:
++                        os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j]))
++                    except:
++                        pass
+                                 
+                 for j in range(0, len(filelist)):
+                     filelist[j] = string.replace(filelist[j], self.dist_dir, '')
+@@ -228,7 +235,10 @@
+                         pass
+ 
+                 # now create the product/RPMS dir
+-                os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
++                try:
++                    os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
++                except:
++                    pass
+                 
+             else:
+                 os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path))
diff --git a/anaconda-pkgorder.patch b/anaconda-pkgorder.patch
new file mode 100644
index 0000000..b6d66f2
--- /dev/null
+++ b/anaconda-pkgorder.patch
@@ -0,0 +1,51 @@
+--- ./scripts/pkgorder	2006-05-18 00:09:50.134726080 +0300
++++ /pkgorder	2006-05-18 00:09:51.774762776 +0300
+@@ -156,27 +156,27 @@
+     ds = PackageOrderer(arch=arch)
+     ds.setup(fn=config, excludes=options.excludeList, root = testpath)
+ 
+-    addGroups(ds, ["Core", "Base", "Text-based 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, ["Office/Productivity", "Engineering and Scientific",
+-                   "Authoring and Publishing", "Games and Entertainment"])
+-
+-    addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
+-                   "Server Configuration Tools", "DNS Name Server",
+-                   "Windows File Server", "Administration 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, ["News Server", "Legacy Software Development"])
++#    addGroups(ds, ["Base", "Networking"])
++#
++#    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, ["Office/Productivity", "Engineering and Scientific",
++#                   "Authoring and Publishing", "Games and Entertainment"])
++#
++#    addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
++#                   "Server Configuration Tools", "DNS Name Server",
++#                   "Windows File Server", "Administration 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, ["News Server", "Legacy Software Development"])
+ 
+     #Everthing else but kernels - don't depsolve
+     for po in ds.pkgSack.returnPackages():
-- 
2.44.0