summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Nasrat <pnasrat@redhat.com>2005-11-15 04:11:52 +0000
committerPaul Nasrat <pnasrat@redhat.com>2005-11-15 04:11:52 +0000
commitf1591d03c54076a70219732a65d46bbfa765b3f4 (patch)
treef0003c4b085ce0ffeadb113b1669b05db3646b51
parent43d1024c0ad6c6dba246e5ae9c4430c5f32dd94d (diff)
downloadanaconda-f1591d03c54076a70219732a65d46bbfa765b3f4.tar.gz
anaconda-f1591d03c54076a70219732a65d46bbfa765b3f4.tar.xz
anaconda-f1591d03c54076a70219732a65d46bbfa765b3f4.zip
misc fix
-rw-r--r--yuminstall.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/yuminstall.py b/yuminstall.py
index f691facf6..26645a2df 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -344,15 +344,15 @@ class YumSorter(yum.YumBase):
if "%s>%s" % (txmbr.name, dep.name) in self.whiteout:
continue
#XXX: handle in rpmdb too for upgrades
- if pkgs:
+ #if pkgs:
+ # member = self.bestPackageFromList(pkgs)
+ #else:
+ if self.tsInfo.exists(dep.pkgtup):
+ pkgs = self.tsInfo.getMembers(pkgtup=dep.pkgtup)
member = self.bestPackageFromList(pkgs)
else:
- if self.tsInfo.exists(dep.pkgtup):
- pkgs = self.tsInfo.getMembers(pkgtup=dep.pkgtup)
- member = self.bestPackageFromList(pkgs)
- else:
- member = self.tsInfo.addInstall(dep)
- unresolved.append(dep)
+ member = self.tsInfo.addInstall(dep)
+ unresolved.append(dep)
#Add relationship
firstelts = map(lambda tup: tup[0], txmbr.relatedto)
if member.po.pkgtup not in firstelts: