some slight improvements to scan_package_changes()

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1701 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-04-11 18:23:11 +00:00
parent 9ffddd7cb5
commit fbfe0d6dcb
+10 -15
View File
@@ -11776,9 +11776,11 @@ class ServerInterface(TextInterface):
dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = xrepo)
dorm = True
# check if the package is in toBeAdded
if toBeAdded:
dorm = False
atom = dbconn.retrieveAtom(x[1])
atomkey = self.entropyTools.dep_getkey(atom)
atomtag = self.entropyTools.dep_gettag(atom)
@@ -11795,27 +11797,20 @@ class ServerInterface(TextInterface):
# do not add to toBeRemoved
add = False
break
if add:
if not add:
continue
dorm = True
if dorm:
trashed = self.is_counter_trashed(x[0])
if not trashed:
dbtag = dbconn.retrieveVersionTag(x[1])
if dbtag != '':
is_injected = dbconn.isInjected(x[1])
if not is_injected:
toBeInjected.add((x[1],xrepo))
else:
trashed = self.is_counter_trashed(x[0])
if not trashed:
toBeRemoved.add((x[1],xrepo))
else:
dbtag = dbconn.retrieveVersionTag(x[1])
if dbtag != '':
is_injected = dbconn.isInjected(x[1])
if not is_injected:
toBeInjected.add((x[1],xrepo))
else:
trashed = self.is_counter_trashed(x[0])
if not trashed:
toBeRemoved.add((x[1],xrepo))
return toBeAdded, toBeRemoved, toBeInjected