Snapcraft

Merge lp:~dholbach/snapcraft/1497582 into lp:~snappy-dev/snapcraft/core

  1. 1497582
  2. Merge into core
Proposed by Daniel Holbach on 2015-09-21
Status: Rejected
Rejected by: Michael Vogt on 2015-09-22
Proposed branch: lp:~dholbach/snapcraft/1497582
Merge into: lp:~snappy-dev/snapcraft/core
Diff against target: 15 lines (+5/-0)
1 file modified
snapcraft/repo.py (+5/-0)
To merge this branch: bzr merge lp:~dholbach/snapcraft/1497582
Reviewer Review Type Date Requested Status
Snappy Developers 2015-09-21 Pending
Michael Vogt 2015-09-21 Pending
Review via email: mp+271801@code.launchpad.net

Commit Message

use packages which actually provide virtual packages

To post a comment you must log in.
lp:~dholbach/snapcraft/1497582 updated on 2015-09-21
186. By Daniel Holbach on 2015-09-21

catch error

Daniel Holbach (dholbach) wrote :

It looks like lp:~snappy-dev/snapcraft/more-apt already solved the problem.

Unmerged revisions

186. By Daniel Holbach on 2015-09-21

catch error

185. By Daniel Holbach on 2015-09-21

use packages which actually provide virtual packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snapcraft/repo.py'
2--- snapcraft/repo.py 2015-09-07 20:23:57 +0000
3+++ snapcraft/repo.py 2015-09-21 12:21:23 +0000
4@@ -102,6 +102,11 @@
5 if pkg in self.manifest_dep_names and pkg not in package_names:
6 continue
7 deps = set()
8+ if self.apt_cache.is_virtual_package(pkg):
9+ try:
10+ pkg = self.apt_cache.get_providing_packages(pkg)[0].name
11+ except KeyError:
12+ raise PackageNotFoundError(pkg)
13 try:
14 candidate_pkg = self.apt_cache[pkg].candidate
15 except KeyError:

Subscribers

People subscribed via source and target branches