summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-02-11 23:46:19 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-02-11 23:46:19 +0100
commite25f35b3ea11d73e4973af5795b67a16035a6e58 (patch)
tree4a8d3b8d9cc2c03128b6e64f7943a18c2bb2f0c0
parentf567c2545b989db75cd799f5a357b456d92ee6ab (diff)
downloadgit-buildpackage-e25f35b3ea11d73e4973af5795b67a16035a6e58.tar.gz
git-buildpackage-e25f35b3ea11d73e4973af5795b67a16035a6e58.tar.bz2
git-buildpackage-e25f35b3ea11d73e4973af5795b67a16035a6e58.zip
we don't necessarily import an upstream version, so fix the function name
-rwxr-xr-xgit-import-dsc10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-import-dsc b/git-import-dsc
index 1e8e2ff8..8591c4b8 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -82,10 +82,10 @@ def parse_dsc(dscfile):
return dsc
-def import_upstream(src, dirs, options, tagger):
+def import_initial(src, dirs, options, tagger):
"""
- import a new upstream version, create the upstream branch in case of a non
- debian native package and tag appropriately
+ import the intial version and (in the case of a non native package) create
+ the 'upstream' branch. Tag everything appropriately.
"""
try:
unpackTGZ = gbpc.UnpackTGZ(src.tgz, dirs['tmp'])
@@ -133,7 +133,7 @@ def move_tree(src, dirs):
os.rename(dirs['git'], src.pkg)
except OSError, err:
print >>sys.stderr, "Cannot move git repository '%s' to it's final location '%s': %s" % (dirs['git'],
- os.path.abspath(src.pkg), err)
+ os.path.abspath(src.pkg), err)
return False
else:
gbpc.RemoveTree(dirs['tmp'])()
@@ -176,7 +176,7 @@ def main(argv):
raise GbpError
dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='.'))
- if not import_upstream(src, dirs, options, gitTag):
+ if not import_initial(src, dirs, options, gitTag):
raise GbpError
os.chdir(dirs['top'])
if not src.native: