aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-orig
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-10-16 16:07:19 +0200
committerGuido Günther <agx@sigxcpu.org>2011-10-16 19:16:13 +0200
commit351aed961f97b96dd63bbe23b482abf005b58b8f (patch)
treee0a7b2bc5cf8d88a83dc7967af8d17574a280c42 /git-import-orig
parentefe9220041ae67ba81d0cb1f761364ef16134ac7 (diff)
Move guess_upstream_version into UpstreamSource
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 6c70905c..cd0127dd 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -28,7 +28,7 @@ import tempfile
import gbp.command_wrappers as gbpc
from gbp.deb import (parse_changelog, UpstreamSource,
NoChangelogError, has_epoch,
- guess_upstream_version, do_uscan,
+ do_uscan,
parse_changelog_repo, is_valid_packagename,
packagename_msg, is_valid_upstreamversion,
upstreamversion_msg)
@@ -115,7 +115,7 @@ def upstream_import_commit_msg(options, version):
def detect_name_and_version(repo, source, options):
# Guess defaults for the package name and version from the
# original tarball.
- (guessed_package, guessed_version) = guess_upstream_version(source.path) or ('', '')
+ (guessed_package, guessed_version) = source.guess_version() or ('', '')
# Try to find the source package name
try: