From-Import-Removal
This commit is contained in:
@@ -25,8 +25,7 @@ _ = __trans.ugettext
|
|||||||
import pisi
|
import pisi
|
||||||
import pisi.context as ctx
|
import pisi.context as ctx
|
||||||
import pisi.util as util
|
import pisi.util as util
|
||||||
|
import pisi.version
|
||||||
from pisi.version import Version
|
|
||||||
|
|
||||||
class Error(pisi.Error):
|
class Error(pisi.Error):
|
||||||
pass
|
pass
|
||||||
@@ -40,8 +39,8 @@ def check_dbversion(versionfile, ver, write=False, update=False):
|
|||||||
if os.path.exists(verfn):
|
if os.path.exists(verfn):
|
||||||
verfile = file(verfn, 'r')
|
verfile = file(verfn, 'r')
|
||||||
ls = verfile.readlines()
|
ls = verfile.readlines()
|
||||||
currver = Version(ls[0])
|
currver = pisi.version.Version(ls[0])
|
||||||
dbver = Version(ver)
|
dbver = pisi.version.Version(ver)
|
||||||
if currver < dbver:
|
if currver < dbver:
|
||||||
if not update:
|
if not update:
|
||||||
raise Error(_('Database version %s is obsolete. Please run the rebuild-db command.') % versionfile)
|
raise Error(_('Database version %s is obsolete. Please run the rebuild-db command.') % versionfile)
|
||||||
|
|||||||
Reference in New Issue
Block a user