Merge lp:~racb/ubuntu-dev-tools/check-mir-depends-arch-spec into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Proposed by Robie Basak
Status: Merged
Approved by: Martin Pitt
Approved revision: 1411
Merged at revision: 1411
Proposed branch: lp:~racb/ubuntu-dev-tools/check-mir-depends-arch-spec
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 32 lines (+7/-1)
2 files modified
check-mir (+2/-1)
debian/changelog (+5/-0)
To merge this branch: bzr merge lp:~racb/ubuntu-dev-tools/check-mir-depends-arch-spec
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+211259@code.launchpad.net

Commit message

check-mir: correctly parse dependencies with architecture specifications

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Looks good, thanks! Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'check-mir'
2--- check-mir 2012-05-26 22:46:24 +0000
3+++ check-mir 2014-03-17 08:26:53 +0000
4@@ -106,7 +106,8 @@
5 for field in ('Depends', 'Pre-Depends', 'Recommends'):
6 if field not in control.section:
7 continue
8- for or_group in apt.apt_pkg.parse_depends(control.section[field]):
9+ for or_group in apt.apt_pkg.parse_src_depends(
10+ control.section[field]):
11 pkgname = or_group[0][0]
12 if pkgname.startswith('$'):
13 continue
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2014-02-25 21:28:10 +0000
17+++ debian/changelog 2014-03-17 08:26:53 +0000
18@@ -1,9 +1,14 @@
19 ubuntu-dev-tools (0.153) UNRELEASED; urgency=medium
20
21+ [ Stefano Rivera ]
22 * Thanks for the NMU, Paul.
23 * Explicitly use xz compression when building source packages, rather than
24 relying on dpkg >= 1.16.5 behavior.
25
26+ [ Robie Basak ]
27+ * check-mir: correctly parse dependencies with architecture specifications
28+ (LP: #1149679).
29+
30 -- Stefano Rivera <stefanor@debian.org> Tue, 25 Feb 2014 22:45:05 +0200
31
32 ubuntu-dev-tools (0.152+nmu1) unstable; urgency=medium

Subscribers

People subscribed via source and target branches

to status/vote changes: