[merge] cleanup from -catbox branch

This commit is contained in:
S.Çağlar Onur
2007-05-22 16:20:19 +00:00
parent a2290a153a
commit bb1fe5fbfc
-6
View File
@@ -10,16 +10,11 @@
# Please read the COPYING file. # Please read the COPYING file.
# #
import os
import fcntl
import types
import gettext import gettext
__trans = gettext.translation('pisi', fallback=True) __trans = gettext.translation('pisi', fallback=True)
_ = __trans.ugettext _ = __trans.ugettext
import pisi import pisi
import pisi.util as util
import pisi.context as ctx import pisi.context as ctx
import pisi.lockeddbshelve as shelve import pisi.lockeddbshelve as shelve
@@ -90,7 +85,6 @@ class ItemByRepoDB(object):
if repo == None: if repo == None:
repo = repos repo = repos
assert repo in [all, repos] assert repo in [all, repos]
import pisi.repodb
order = [ 'repo-' + x for x in ctx.repodb.list() ] order = [ 'repo-' + x for x in ctx.repodb.list() ]
if repo == all: if repo == all:
order += ['trdparty', 'inst'] order += ['trdparty', 'inst']