summaryrefslogtreecommitdiff
path: root/git-import-orig
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-10-06 19:17:14 +0200
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-10-06 19:17:14 +0200
commit16425af87c8e566f5eff6b255c55ebf9159708c2 (patch)
treec20a8ce5846a3fa60e9ac60d5b32a34c3ccc1110 /git-import-orig
parent29948a722e3a63668c29239e072381731070e017 (diff)
downloadgit-buildpackage-16425af87c8e566f5eff6b255c55ebf9159708c2.tar.gz
git-buildpackage-16425af87c8e566f5eff6b255c55ebf9159708c2.tar.bz2
git-buildpackage-16425af87c8e566f5eff6b255c55ebf9159708c2.zip
more robust regex matching, sanitze all version numbers before running git-tagdebian/0.2.7
Diffstat (limited to 'git-import-orig')
-rwxr-xr-xgit-import-orig4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-import-orig b/git-import-orig
index ca802996..fdf597e1 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -24,7 +24,7 @@ import re
import glob
from optparse import OptionParser
from git_buildpackage import *
-from git_buildpackage.utils import is_repository_clean, is_repository
+from git_buildpackage.git_utils import *
def cleanupTmpTree(tree):
@@ -108,7 +108,7 @@ def main():
gitCheckoutUpstream()
gitShowBranch()
GitLoadDirs()(origdir)
- GitTag()(version)
+ GitTag()(sanitize_version(version))
print "Merging to master..."
gitCheckoutMaster()