diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-03 17:54:33 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-03 17:54:33 -0300 |
| commit | 702819a4a3fdd9426bd36bbbd91a3d7ba916668a (patch) | |
| tree | 154e6ccf02324b00f79d6aba79b3eaad30216db0 /gbp/rpm | |
| parent | 3b99b64630a7c6f165b15905733e007b229d7381 (diff) | |
pkg: clear __init__.py
for readability
Diffstat (limited to 'gbp/rpm')
| -rw-r--r-- | gbp/rpm/__init__.py | 4 | ||||
| -rw-r--r-- | gbp/rpm/policy.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py index 253a2e56..38ecbac8 100644 --- a/gbp/rpm/__init__.py +++ b/gbp/rpm/__init__.py @@ -30,7 +30,7 @@ from gbp.errors import GbpError from gbp.git import GitRepositoryError from gbp.patch_series import (PatchSeries, Patch) import gbp.log -from gbp.pkg import (UpstreamSource, parse_archive_filename) +from gbp.pkg import (UpstreamSource, Archive) from gbp.rpm.policy import RpmPkgPolicy from gbp.rpm.linkedlist import LinkedList from gbp.rpm.lib_rpm import librpm, get_librpm_log @@ -788,7 +788,7 @@ class SpecFile(object): src = {'num': num, 'filename': os.path.basename(filename), 'uri': filename} src['filename_base'], src['archive_fmt'], src['compression'] = \ - parse_archive_filename(os.path.basename(filename)) + Archive.parse_filename(os.path.basename(filename)) if (src['filename_base'].startswith(self.name) and src['archive_fmt']): # Take the first archive that starts with pkg name diff --git a/gbp/rpm/policy.py b/gbp/rpm/policy.py index e5be7fef..a027ed99 100644 --- a/gbp/rpm/policy.py +++ b/gbp/rpm/policy.py @@ -18,7 +18,7 @@ import re -from gbp.pkg import PkgPolicy, parse_archive_filename +from gbp.pkg import PkgPolicy, Archive from gbp.scripts.common.pq import parse_gbp_commands @@ -68,7 +68,7 @@ class RpmPkgPolicy(PkgPolicy): >>> RpmPkgPolicy.is_valid_orig_archive("foo.gz") False """ - _base, arch_fmt, _compression = parse_archive_filename(filename) + _base, arch_fmt, _compression = Archive.parse_filename(filename) if arch_fmt: return True return False |