diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2014-07-22 08:56:42 +0200 |
| commit | 04597f25729740406775a3dff528c9774c84efd5 (patch) | |
| tree | fe905fc94afbdcfad60d5aaf88886a1f10f92a8c /dedup/debpkg.py | |
| parent | ba9ae116e0bbb25e2df327ba48c82472ccfa2690 (diff) | |
| parent | d48c3c208ee6ba54225b3eb68ce5c9f3c894bfa4 (diff) | |
| download | debian-dedup-04597f25729740406775a3dff528c9774c84efd5.tar.gz | |
Merge branch master into multiarch
Resolve accumulated conflicts. In particular webapp.py gained a few
non-trivial ones, such as changes in InternalRedirect or usage of
contextlib.closing.
Conflicts:
schema.sql
webapp.py
Diffstat (limited to 'dedup/debpkg.py')
| -rw-r--r-- | dedup/debpkg.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dedup/debpkg.py b/dedup/debpkg.py index 6d857ba..cd8616f 100644 --- a/dedup/debpkg.py +++ b/dedup/debpkg.py @@ -3,7 +3,7 @@ from debian import deb822 from dedup.hashing import hash_file def process_control(control_contents): - """Parses the contents of a control file from a control.tar.gz of a Debian + """Parses the contents of a control file from a control.tar of a Debian package and returns a dictionary containing the fields relevant to dedup. @type control_contents: bytes @rtype: {str: object} @@ -16,8 +16,8 @@ def process_control(control_contents): source = package version = control["version"].encode("ascii") architecture = control["architecture"].encode("ascii") - - depends = set(dep[0]["name"].encode("ascii") + # deb822 currently returns :any dependencies raw. see #670679 + depends = set(dep[0]["name"].split(u':', 1)[0].encode("ascii") for dep in control.relations.get("depends", ()) if len(dep) == 1) ret = dict(package=package, source=source, version=version, |