Merge lp:~lifeless/ubuntu/lucid/apt/bug-22354 into lp:ubuntu/lucid/apt

Proposed by Robert Collins on 2010-02-18
Status: Merged
Merge reported by: Robert Collins
Merged at revision: not available
Proposed branch: lp:~lifeless/ubuntu/lucid/apt/bug-22354
Merge into: lp:ubuntu/lucid/apt
Diff against target: 117 lines (+31/-6)
5 files modified
AUTHORS (+4/-0)
apt-pkg/contrib/strutl.cc (+12/-0)
apt-pkg/contrib/strutl.h (+1/-0)
apt-pkg/deb/debindexfile.cc (+6/-6)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~lifeless/ubuntu/lucid/apt/bug-22354
Reviewer Review Type Date Requested Status
Michael Vogt 2010-02-18 Approve on 2010-02-18
Ubuntu branches 2010-02-18 Pending
Review via email: mp+19569@code.launchpad.net
To post a comment you must log in.
Robert Collins (lifeless) wrote :

I had some trouble diagnosing a multiple-PPA sources issue, so I fixed this bug.

Michael Vogt (mvo) wrote :

The merge is a bit unhappy:

$ bzr log lp:~lifeless/ubuntu/lucid/apt/bug-22354|head -n 15
------------------------------------------------------------
revno: 98
committer: Robert Collins <email address hidden>
branch nick: apt
timestamp: Thu 2010-02-18 13:39:30 +1100
message:
  Change the package index Info methods to allow apt-cache policy to be
  useful when using several different archives on the same host.
  (Closes: #329814, LP: #22354)
------------------------------------------------------------
revno: 97
tags: 0.7.25ubuntu4
author: Michael Vogt <email address hidden>
committer: Bazaar Package Importer <email address hidden>
branch nick: lucid
$ $ bzr merge -r 97..98 lp:~lifeless/ubuntu/lucid/apt/bug-22354
bzr: ERROR: Requested revision: u'98' does not exist in branch: RemoteBranch(bzr+ssh://bazaar.launchpad.net/~lifeless/ubuntu/lucid/apt/bug-22354/)

The diff itself is fine and I merged it into lp:~mvo/apt/mvo (from where it will travel to debian and ubuntu). Many thanks!

review: Approve
Robert Collins (lifeless) wrote :

Thank you!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2005-03-07 20:08:33 +0000
3+++ AUTHORS 2010-02-18 02:54:14 +0000
4@@ -12,6 +12,10 @@
5 Michael Vogt <mvo@debian.org>
6 - Development and bug fixes
7
8+Robert Collins <robert.collins@canonical.com>
9+- Change the package index Info methods to allow apt-cache policy to be useful
10+ when using several different archives on the same host.
11+
12 Past Contributors:
13
14 CVS:che Ben Gertzfield <che@debian.org>
15
16=== modified file 'apt-pkg/contrib/strutl.cc'
17--- apt-pkg/contrib/strutl.cc 2009-12-14 09:27:26 +0000
18+++ apt-pkg/contrib/strutl.cc 2010-02-18 02:54:14 +0000
19@@ -1306,3 +1306,15 @@
20 return U;
21 }
22 /*}}}*/
23+// URI::NoUserPassword - Return the schema, site and path for the URI /*{{{*/
24+// ---------------------------------------------------------------------
25+/* */
26+string URI::NoUserPassword(const string &URI)
27+{
28+ ::URI U(URI);
29+ U.User.clear();
30+ U.Password.clear();
31+ U.Port = 0;
32+ return U;
33+}
34+ /*}}}*/
35
36=== modified file 'apt-pkg/contrib/strutl.h'
37--- apt-pkg/contrib/strutl.h 2009-12-22 09:44:08 +0000
38+++ apt-pkg/contrib/strutl.h 2010-02-18 02:54:14 +0000
39@@ -120,6 +120,7 @@
40 inline void operator =(const string &From) {CopyFrom(From);};
41 inline bool empty() {return Access.empty();};
42 static string SiteOnly(const string &URI);
43+ static string NoUserPassword(const string &URI);
44
45 URI(string Path) {CopyFrom(Path);};
46 URI() : Port(0) {};
47
48=== modified file 'apt-pkg/deb/debindexfile.cc'
49--- apt-pkg/deb/debindexfile.cc 2008-11-24 10:52:20 +0000
50+++ apt-pkg/deb/debindexfile.cc 2010-02-18 02:54:14 +0000
51@@ -35,12 +35,12 @@
52 // SourcesIndex::SourceInfo - Short 1 liner describing a source /*{{{*/
53 // ---------------------------------------------------------------------
54 /* The result looks like:
55- http://foo/ stable/main src 1.1.1 (dsc) */
56+ http://foo/debian/ stable/main src 1.1.1 (dsc) */
57 string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
58 pkgSrcRecords::File const &File) const
59 {
60 string Res;
61- Res = ::URI::SiteOnly(URI) + ' ';
62+ Res = ::URI::NoUserPassword(URI) + ' ';
63 if (Dist[Dist.size() - 1] == '/')
64 {
65 if (Dist != "/")
66@@ -88,7 +88,7 @@
67 /* */
68 string debSourcesIndex::Info(const char *Type) const
69 {
70- string Info = ::URI::SiteOnly(URI) + ' ';
71+ string Info = ::URI::NoUserPassword(URI) + ' ';
72 if (Dist[Dist.size() - 1] == '/')
73 {
74 if (Dist != "/")
75@@ -159,7 +159,7 @@
76 /* This is a shorter version that is designed to be < 60 chars or so */
77 string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
78 {
79- string Res = ::URI::SiteOnly(URI) + ' ';
80+ string Res = ::URI::NoUserPassword(URI) + ' ';
81 if (Dist[Dist.size() - 1] == '/')
82 {
83 if (Dist != "/")
84@@ -195,7 +195,7 @@
85 /* */
86 string debPackagesIndex::Info(const char *Type) const
87 {
88- string Info = ::URI::SiteOnly(URI) + ' ';
89+ string Info = ::URI::NoUserPassword(URI) + ' ';
90 if (Dist[Dist.size() - 1] == '/')
91 {
92 if (Dist != "/")
93@@ -384,7 +384,7 @@
94 /* */
95 string debTranslationsIndex::Info(const char *Type) const
96 {
97- string Info = ::URI::SiteOnly(URI) + ' ';
98+ string Info = ::URI::NoUserPassword(URI) + ' ';
99 if (Dist[Dist.size() - 1] == '/')
100 {
101 if (Dist != "/")
102
103=== modified file 'debian/changelog'
104--- debian/changelog 2010-02-02 16:58:59 +0000
105+++ debian/changelog 2010-02-18 02:54:14 +0000
106@@ -1,3 +1,11 @@
107+apt (0.7.25ubuntu5) lucid; urgency=low
108+
109+ * Change the package index Info methods to allow apt-cache policy to be
110+ useful when using several different archives on the same host.
111+ (Closes: #329814, LP: #22354)
112+
113+ -- Robert Collins <robertc@robertcollins.net> Thu, 18 Feb 2010 13:36:54 +1100
114+
115 apt (0.7.25ubuntu4) lucid; urgency=low
116
117 * cmdline/apt-cdrom.cc:

Subscribers

People subscribed via source and target branches

to all changes: