Merge lp:~mvo/aptdaemon/debfile-fix1 into lp:aptdaemon

Proposed by Michael Vogt
Status: Merged
Merged at revision: 758
Proposed branch: lp:~mvo/aptdaemon/debfile-fix1
Merge into: lp:aptdaemon
Diff against target: 28 lines (+0/-18)
1 file modified
aptdaemon/worker.py (+0/-18)
To merge this branch: bzr merge lp:~mvo/aptdaemon/debfile-fix1
Reviewer Review Type Date Requested Status
Aptdaemon Developers Pending
Review via email: mp+87344@code.launchpad.net

Description of the change

This reverts r757 because
a) DebFile.check() will do the same
b) apt_pkg.config.value_list("APT::Architectures") is empty even on a multiarch system (arguably a bug in apt)

Unless I miss something of course :) But even then (b) will not work and needs to be replaced with apt_pkg.get_architectures()

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aptdaemon/worker.py'
2--- aptdaemon/worker.py 2011-12-16 07:10:50 +0000
3+++ aptdaemon/worker.py 2012-01-03 12:43:36 +0000
4@@ -1186,24 +1186,6 @@
5 raise TransactionFailed(ERROR_UNREADABLE_PACKAGE_FILE, path)
6 except Exception as error:
7 raise TransactionFailed(ERROR_INVALID_PACKAGE_FILE, str(error))
8- # Check architecture
9- try:
10- deb_arch = deb["Architecture"]
11- except KeyError:
12- raise TransactionFailed(ERROR_INVALID_PACKAGE_FILE,
13- _("The package file doesn't contain any "
14- "architecture information. This is a "
15- "serious issue. Please report this to "
16- "the creator of the file."))
17- if not (deb_arch.lower() == "all" or
18- deb_arch == apt_pkg.config["APT::Architecture"] or
19- deb_arch in apt_pkg.config.value_list("APT::Architectures")):
20- #TRANSLATORS: %s is an architecture, e.g. amd64 or i386
21- raise TransactionFailed(ERROR_DEP_RESOLUTION_FAILED,
22- _("The package file is for processors of "
23- "the %s architecture and is not "
24- "supported by your system.") % deb_arch)
25- # Check dependencies
26 try:
27 ret = deb.check()
28 except Exception as error:

Subscribers

People subscribed via source and target branches

to status/vote changes: