diff options
Diffstat (limited to 'gbp/deb')
| -rw-r--r-- | gbp/deb/__init__.py | 6 | ||||
| -rw-r--r-- | gbp/deb/policy.py | 6 | ||||
| -rw-r--r-- | gbp/deb/pristinetar.py | 4 | ||||
| -rw-r--r-- | gbp/deb/upstreamsource.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gbp/deb/__init__.py b/gbp/deb/__init__.py index 234d781..b3b8225 100644 --- a/gbp/deb/__init__.py +++ b/gbp/deb/__init__.py @@ -80,7 +80,7 @@ def parse_changelog_repo(repo, branch, filename): return ChangeLog(repo.show(sha)) -def orig_file(cp, compression, subtarball=None): +def orig_file(cp, compression, component=None): """ The name of the orig file belonging to changelog cp @@ -88,13 +88,13 @@ def orig_file(cp, compression, subtarball=None): 'foo_1.0.orig.tar.bz2' >>> orig_file({'Source': 'bar', 'Upstream-Version': '0.0~git1234'}, "xz") 'bar_0.0~git1234.orig.tar.xz' - >>> orig_file({'Source': 'bar', 'Upstream-Version': '0.0~git1234'}, "xz", subtarball="sub1") + >>> orig_file({'Source': 'bar', 'Upstream-Version': '0.0~git1234'}, "xz", component="sub1") 'bar_0.0~git1234.orig-sub1.tar.xz' """ return DebianPkgPolicy.build_tarball_name(cp['Source'], cp['Upstream-Version'], compression, - subtarball=subtarball) + component=component) def get_arch(): 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) diff --git a/gbp/deb/pristinetar.py b/gbp/deb/pristinetar.py index 09e4d4e..ab7fbd6 100644 --- a/gbp/deb/pristinetar.py +++ b/gbp/deb/pristinetar.py @@ -43,7 +43,7 @@ class DebianPristineTar(PristineTar): return super(DebianPristineTar, self).has_commit(name_regexp) - def checkout(self, package, version, comp_type, output_dir, subtarball=None): + def checkout(self, package, version, comp_type, output_dir, component=None): """ Checkout the orig tarball for package I{package} of I{version} and compression type I{comp_type} to I{output_dir} @@ -61,6 +61,6 @@ class DebianPristineTar(PristineTar): version, comp_type, output_dir, - subtarball=subtarball) + component=component) super(DebianPristineTar, self).checkout(name) diff --git a/gbp/deb/upstreamsource.py b/gbp/deb/upstreamsource.py index 651043e..4895627 100644 --- a/gbp/deb/upstreamsource.py +++ b/gbp/deb/upstreamsource.py @@ -34,7 +34,7 @@ class DebianUpstreamSource(UpstreamSource): DebianPkgPolicy) -def unpack_subtarball(dest, component, tarball, filters): +def unpack_component_tarball(dest, component, tarball, filters): """ Unpack the tarball I{tarball} into dest naming it I{component}. Apply filters during unpack. |