aboutsummaryrefslogtreecommitdiff
path: root/gbp/deb/policy.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-07-03 19:41:26 +0200
committerGuido Günther <agx@sigxcpu.org>2016-07-04 14:09:58 +0200
commitd681e932b63a21aeaa7d07f4bfb533b583e4c1ae (patch)
tree4f04c067c610426d253a0b1c03cc6cc810a89f31 /gbp/deb/policy.py
parent7621268d39080f467f30465f4955b7c85fe37bca (diff)
Use 'component' and 'additional tarball'
since this is what dpkg-source(1) uses. Git-Dch: Ignore
Diffstat (limited to 'gbp/deb/policy.py')
-rw-r--r--gbp/deb/policy.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gbp/deb/policy.py b/gbp/deb/policy.py
index 7522160..75e7879 100644
--- a/gbp/deb/policy.py
+++ b/gbp/deb/policy.py
@@ -62,7 +62,7 @@ class DebianPkgPolicy(PkgPolicy):
debianversion_chars = 'a-zA-Z\\d.~+-'
@staticmethod
- def build_tarball_name(name, version, compression, dir=None, subtarball=None):
+ def build_tarball_name(name, version, compression, dir=None, component=None):
"""
Given a source package's I{name}, I{version} and I{compression}
return the name of the corresponding upstream tarball.
@@ -71,7 +71,7 @@ class DebianPkgPolicy(PkgPolicy):
'foo_1.0.orig.tar.bz2'
>>> DebianPkgPolicy.build_tarball_name('bar', '0.0~git1234', 'xz')
'bar_0.0~git1234.orig.tar.xz'
- >>> DebianPkgPolicy.build_tarball_name('bar', '0.0~git1234', 'xz', subtarball="foo")
+ >>> DebianPkgPolicy.build_tarball_name('bar', '0.0~git1234', 'xz', component="foo")
'bar_0.0~git1234.orig-foo.tar.xz'
@param name: the source package's name
@@ -86,7 +86,7 @@ class DebianPkgPolicy(PkgPolicy):
@rtype: C{str}
"""
ext = compressor_opts[compression][1]
- sub = '-{0}'.format(subtarball) if subtarball else ''
+ sub = '-{0}'.format(component) if component else ''
tarball = "%s_%s.orig%s.tar.%s" % (name, version, sub, ext)
if dir:
tarball = os.path.join(dir, tarball)