summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-06-29 13:06:40 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-06-29 13:06:40 +0200
commit919b4ed24108491272d463713097e47b4c4d9fc9 (patch)
tree92cdf1cd9b4455e303f1575d9f2596b1761d814f
parentbbf8bc2583df53a7562d99382831389454bc6ee9 (diff)
parent774a66876919712d5b8e12174f01f0337d2f3393 (diff)
- ignore the Vcs-Browser tag (Fixes LP: #121770)
-rw-r--r--cmdline/apt-get.cc9
-rw-r--r--debian/changelog1
2 files changed, 9 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6aafe9704..5a6369476 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2116,10 +2116,15 @@ bool DoSource(CommandLine &CmdL)
string srec = Last->AsStr();
string::size_type pos = srec.find("\nVcs-");
- if (pos != string::npos )
+ while (pos != string::npos)
{
pos += strlen("\nVcs-");
string vcs = srec.substr(pos,srec.find(":",pos)-pos);
+ if(vcs == "Browser")
+ {
+ pos = srec.find("\nVcs-", pos);
+ continue;
+ }
pos += vcs.length()+2;
string::size_type epos = srec.find("\n", pos);
string uri = srec.substr(pos,epos-pos).c_str();
@@ -2135,6 +2140,8 @@ bool DoSource(CommandLine &CmdL)
ioprintf(c1out, "Are you sure you want to continue [yN]? ");
if(!YnPrompt(false))
return _error->Error(_("Abort."));
+ else
+ break;
}
// Back track
diff --git a/debian/changelog b/debian/changelog
index e14f15499..96dfafa5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ apt (0.7.2ubuntu4) unstable; urgency=low
* cmdline/apt-get.cc:
- make the XS-Vcs-$foo warning more copy'n'paste
friendly (thanks to Matt Zimmerman)
+ - ignore the Vcs-Browser tag (Fixes LP: #121770)
--