[MERGE] From-Import-Removal

This commit is contained in:
Faik Uygur
2007-04-27 07:35:59 +00:00
parent 29edefe5ea
commit fa46a226cc
+3 -4
View File
@@ -25,8 +25,7 @@ _ = __trans.ugettext
import pisi
import pisi.context as ctx
from pisi.util import join_path
from pisi.version import Version
import pisi.version
class Error(pisi.Error):
pass
@@ -40,8 +39,8 @@ def check_dbversion(versionfile, ver, write=False, update=False):
if os.path.exists(verfn):
verfile = file(verfn, 'r')
ls = verfile.readlines()
currver = Version(ls[0])
dbver = Version(ver)
currver = pisi.version.Version(ls[0])
dbver = pisi.version.Version(ver)
if currver < dbver:
if not update:
raise Error(_('Database version for %s insufficient. Please run rebuild-db command.') % versionfile)