anaconda/sme7/0005-Always-pick-best-arch-for-package.patch

From 8f00e66cee788c1fe88f6b1b6f80390f20b5ea58 Mon Sep 17 00:00:00 2001
From: Shad L. Lords <slords@mail.com>
Date: Mon, 26 Oct 2009 17:11:54 -0600
Subject: [PATCH] Always pick best arch for package

---
 findpackageset.py |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/findpackageset.py b/findpackageset.py
index bb21691..6f79e51 100644
--- a/findpackageset.py
+++ b/findpackageset.py
@@ -108,21 +108,15 @@ def findpackageset(hdrlist, dbPath='/'):
     # loop through packages and find ones which are a newer
     # version than what we have
     for ( name, arch ) in instDict.keys():
-        if ( name, arch ) in availDict.keys():
-            # Exact arch upgrade
-            h = instDict[(name, arch)]
-            pkg = availDict[(name,arch)] 
-            comparePackageForUpgrade(updDict, h, pkg)
-        else:
-            # See if we have a better arch than that installed
-            if name in availNames.keys():
-                bestarch = findBestArch(availNames[name])
-                if not bestarch:
-                    continue
-                if availDict.has_key((name,bestarch)):
-                    h = instDict[(name,arch)]
-                    pkg = availDict[(name,bestarch)]
-                    comparePackageForUpgrade(updDict, h, pkg)
+        # See if we have a better arch than that installed
+        if name in availNames.keys():
+            bestarch = findBestArch(availNames[name])
+            if not bestarch:
+                continue
+            if availDict.has_key((name,bestarch)):
+                h = instDict[(name,arch)]
+                pkg = availDict[(name,bestarch)]
+                comparePackageForUpgrade(updDict, h, pkg)
                     
     # handle obsoletes
     for pkg in hdlist:
-- 
1.5.5.6

1	slords	1.1	From 8f00e66cee788c1fe88f6b1b6f80390f20b5ea58 Mon Sep 17 00:00:00 2001
2			From: Shad L. Lords <slords@mail.com>
3			Date: Mon, 26 Oct 2009 17:11:54 -0600
4			Subject: [PATCH] Always pick best arch for package
5
6			---
7			findpackageset.py \| 24 +++++++++---------------
8			1 files changed, 9 insertions(+), 15 deletions(-)
9
10			diff --git a/findpackageset.py b/findpackageset.py
11			index bb21691..6f79e51 100644
12			--- a/findpackageset.py
13			+++ b/findpackageset.py
14			@@ -108,21 +108,15 @@ def findpackageset(hdrlist, dbPath='/'):
15			# loop through packages and find ones which are a newer
16			# version than what we have
17			for ( name, arch ) in instDict.keys():
18			- if ( name, arch ) in availDict.keys():
19			- # Exact arch upgrade
20			- h = instDict[(name, arch)]
21			- pkg = availDict[(name,arch)]
22			- comparePackageForUpgrade(updDict, h, pkg)
23			- else:
24			- # See if we have a better arch than that installed
25			- if name in availNames.keys():
26			- bestarch = findBestArch(availNames[name])
27			- if not bestarch:
28			- continue
29			- if availDict.has_key((name,bestarch)):
30			- h = instDict[(name,arch)]
31			- pkg = availDict[(name,bestarch)]
32			- comparePackageForUpgrade(updDict, h, pkg)
33			+ # See if we have a better arch than that installed
34			+ if name in availNames.keys():
35			+ bestarch = findBestArch(availNames[name])
36			+ if not bestarch:
37			+ continue
38			+ if availDict.has_key((name,bestarch)):
39			+ h = instDict[(name,arch)]
40			+ pkg = availDict[(name,bestarch)]
41			+ comparePackageForUpgrade(updDict, h, pkg)
42
43			# handle obsoletes
44			for pkg in hdlist:
45			--
46			1.5.5.6
47