[merge] cleanup from -catbox branch
This commit is contained in:
+3
-7
@@ -10,8 +10,6 @@
|
|||||||
# Please read the COPYING file.
|
# Please read the COPYING file.
|
||||||
#
|
#
|
||||||
|
|
||||||
import os, fcntl
|
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
__trans = gettext.translation('pisi', fallback=True)
|
__trans = gettext.translation('pisi', fallback=True)
|
||||||
_ = __trans.ugettext
|
_ = __trans.ugettext
|
||||||
@@ -19,8 +17,6 @@ _ = __trans.ugettext
|
|||||||
import pisi
|
import pisi
|
||||||
import pisi.lockeddbshelve as shelve
|
import pisi.lockeddbshelve as shelve
|
||||||
import pisi.context as ctx
|
import pisi.context as ctx
|
||||||
import pisi.packagedb as packagedb
|
|
||||||
import pisi.util as util
|
|
||||||
|
|
||||||
class Error(pisi.Error):
|
class Error(pisi.Error):
|
||||||
pass
|
pass
|
||||||
@@ -101,9 +97,9 @@ class RepoDB(object):
|
|||||||
name = str(name)
|
name = str(name)
|
||||||
def proc(txn):
|
def proc(txn):
|
||||||
self.d.delete("repo-" + name, txn)
|
self.d.delete("repo-" + name, txn)
|
||||||
list = self.d.get("order", txn)
|
l = self.d.get("order", txn)
|
||||||
list.remove(name)
|
l.remove(name)
|
||||||
self.d.put("order", list, txn)
|
self.d.put("order", l, txn)
|
||||||
ctx.packagedb.remove_repo(name, txn=txn)
|
ctx.packagedb.remove_repo(name, txn=txn)
|
||||||
ctx.sourcedb.remove_repo(name, txn=txn)
|
ctx.sourcedb.remove_repo(name, txn=txn)
|
||||||
ctx.componentdb.remove_repo(name, txn=txn)
|
ctx.componentdb.remove_repo(name, txn=txn)
|
||||||
|
|||||||
Reference in New Issue
Block a user