summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornecoro <>2007-06-20 12:08:24 +0000
committernecoro <>2007-06-20 12:08:24 +0000
commit383a61d2b0cda8ebbe46468bb1b40bddd608c1fb (patch)
tree3c36dbfbdc0202a2883efe2f4297c6c0758f2340
parentce5a9758933751a7a0f0f6813f290a05f5b2a424 (diff)
downloadportato-383a61d2b0cda8ebbe46468bb1b40bddd608c1fb.tar.gz
portato-383a61d2b0cda8ebbe46468bb1b40bddd608c1fb.tar.bz2
portato-383a61d2b0cda8ebbe46468bb1b40bddd608c1fb.zip
ignored None values in get_new_packages ... but now give a warning :)
Diffstat (limited to '')
-rw-r--r--portato/backend/portage/system.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index ecdab4d..739c577 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -274,19 +274,25 @@ class PortageSystem (SystemInterface):
new_packages = []
for p in packages:
inst = self.find_installed_packages(p)
+
+ best_p = self.find_best_match(p)
+ if best_p is None:
+ debug("No best match for",p,"-- It seems not to be in the tree anymore.",warn = True)
+ continue
+
if len(inst) > 1:
myslots = set()
for i in inst: # get the slots of the installed packages
myslots.add(i.get_package_settings("SLOT"))
- myslots.add(self.find_best_match(p).get_package_settings("SLOT")) # add the slot of the best package in portage
+ myslots.add(best_p.get_package_settings("SLOT")) # add the slot of the best package in portage
for slot in myslots:
new_packages.append(\
self.find_best(\
[x.get_cpv() for x in self.find_packages("%s:%s" % (i.get_cp(), slot))]\
))
else:
- new_packages.append(self.find_best_match(p))
+ new_packages.append(best_p)
return new_packages
ighlight'> 2006-10-21nomsgnecoro3-17/+32 2006-10-18fixed bug in update_world which ignored systemnecoro3-3/+28 2006-10-16Introduced watch_cursor decoratornecoro2-21/+31 2006-10-16Speedup for "--deep"; loading sign for update world; handling packages not ↵necoro5-18/+67 in portage system (anymore) 2006-10-15Changed confignecoro1-4/+4 2006-10-15Second level of "emerge --update"necoro5-15/+120 2006-10-15Implemented emerge --syncnecoro2-0/+10 2006-10-15First implementation of "emerge --update world"necoro4-17/+100 2006-10-14Wah - I'm tired ...necoro1-3/+3 2006-10-14and now another bug -.-necoro1-2/+2 2006-10-14forgot one returnnecoro1-0/+2 2006-10-14Set min height to 600 if maxHeight is smaller then 800necoro2-4/+7 2006-10-13Some more documentationnecoro2-82/+298 2006-10-13Documentation worknecoro2-154/+160 2006-10-12Enabled oneshotnecoro3-32/+103 2006-10-12Layout updatenecoro1-16/+38 2006-10-12Fixed bugsnecoro2-15/+16 2006-10-12Migrated to UIManagernecoro1-33/+64 2006-10-10Fixed bug not showing the use-flag-list in some casesnecoro1-3/+5 2006-10-09bla - prepared 0.4.0 ; added dialogs.py; extended some commentsnecoro9-125/+293 2006-10-08Made the testing stuff working too ... I hope ^^ ... removed obsolete-dirnecoro7-145/+113 2006-10-05Added first support for the masking stuff ... and hoping that it is going to ↵necoro5-79/+135 work properly ;) 2006-10-05Changed changelog / added config-filenecoro2-0/+10 2006-10-05Added preference windownecoro4-49/+155 2006-10-02Corrected comments, structure, bad algorithms etcnecoro4-176/+209 2006-10-02Corrected indention in commentnecoro1-8/+6 2006-10-010.3.3necoro1-0/+6 2006-10-01Implemented an internal db; removed unmerge-bugnecoro2-26/+43 2006-09-30Implemented some new backend functions which speed up the ↵necoro2-12/+37 package-list-creation. (Thanks an porthole for the inspiration ;P) 2006-09-300.3.2 release; changed font in terminal; added new "masking"-dialognecoro3-11/+36 2006-09-29fixed bugsnecoro4-13/+23 2006-09-29Corrected setup.pynecoro1-1/+1