aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-01-10 19:24:58 +0100
committerGuido Günther <agx@sigxcpu.org>2017-01-11 10:53:43 +0100
commit413b027ca3340abd9b8b3288ce81988f264123f1 (patch)
treef11eae511a4e774f8c86637725d7fa099e3decec
parent4c688e1da8edf0d690fbd71a13a69ed7c61812ee (diff)
Improve wording
Git-Dch: Ignore
-rw-r--r--gbp/pkg/__init__.py2
-rw-r--r--gbp/scripts/common/import_orig.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py
index 70bcb21..03cf581 100644
--- a/gbp/pkg/__init__.py
+++ b/gbp/pkg/__init__.py
@@ -291,7 +291,7 @@ class UpstreamSource(object):
def is_orig(self):
"""
- @return: C{True} if sources are suitable as upstream source,
+ @return: C{True} if sources are suitable as orig tarball,
C{False} otherwise
@rtype: C{bool}
"""
diff --git a/gbp/scripts/common/import_orig.py b/gbp/scripts/common/import_orig.py
index d52e8ec..b21bac9 100644
--- a/gbp/scripts/common/import_orig.py
+++ b/gbp/scripts/common/import_orig.py
@@ -119,7 +119,7 @@ def repacked_tarball_name(source, name, version):
os.path.dirname(source.path),
os.path.basename(source.path).replace(".tar", ".gbp.tar"))
else:
- # Repacked sources or other archives get canonical name
+ # non tarballs (zips, unpacked dirs) get the canonical name
name = os.path.join(
os.path.dirname(source.path),
"%s_%s.orig.tar.bz2" % (name, version))
@@ -130,9 +130,9 @@ def repack_source(source, name, version, tmpdir, filters):
"""Repack the source tree"""
name = repacked_tarball_name(source, name, version)
repacked = source.pack(name, filters)
- if source.is_orig(): # the tarball was filtered on unpack
+ if source.is_orig(): # Orig already was a tarball so it was filtered on unpack
repacked.unpacked = source.unpacked
- else: # otherwise unpack the generated tarball to get a filtered tree
+ else: # otherwise unpack the generated tarball again to get a filtered tree
if tmpdir:
cleanup_tmp_tree(tmpdir)
tmpdir = tempfile.mkdtemp(dir='../')