Move DpkgCompareVersions and add compare_versions

Git-Dch: Ignore

1 files changed, 1 insertions, 24 deletions

diff --git a/git-import-dscs b/git-import-dscs
index ef0a0283..bfece560 100755
--- a/git-import-dscs
+++ b/git-import-dscs
@@ -24,33 +24,10 @@ import re
 import sys
 import tempfile
 import gbp.command_wrappers as gbpc
-from gbp.deb import parse_dsc, DscFile
+from gbp.deb import parse_dsc, DscFile, DpkgCompareVersions
 from gbp.errors import GbpError
 from gbp.git import GitRepository, GitRepositoryError
 
-class DpkgCompareVersions(gbpc.Command):
-    cmd='/usr/bin/dpkg'
-
-    def __init__(self):
-        if not os.access(self.cmd, os.X_OK):
-            raise GbpError, "%s not found - cannot use compare versions" % self.cmd
-        gbpc.Command.__init__(self, self.cmd, ['--compare-versions'])
-
-    def __call__(self, version1, version2):
-        self.run_error = "Couldn't compare %s with %s" % (version1, version2)
-        res = gbpc.Command.call(self, [ version1, 'lt', version2 ])
-        if res not in [ 0, 1 ]:
-            raise gbpc.CommandExecFailed, "%s: bad return code %d" % (self.run_error, res)
-        if res == 0:
-            return -1
-        elif res == 1:
-            res = gbpc.Command.call(self, [ version1, 'gt', version2 ])
-            if res not in [ 0, 1 ]:
-                raise gbpc.CommandExecFailed, "%s: bad return code %d" % (self.run_error, res)
-            if res == 0:
-                return 1
-        return 0
-
 
 class DscCompareVersions(DpkgCompareVersions):
     def __init__(self):