* cmdline/apt-get.cc:

  - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
    this will warn when Vcs- headers are found on apt-get source
    (Fixes LP:#115959)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 554677f39da64df196fe2f5bd4b4a167d3c88873..51bcfde12f43c00f2a0617f26302fe6e1c09dba9 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2114,6 +2114,28 @@ bool DoSource(CommandLine &CmdL)
       if (Last == 0)
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       
+      string srec = Last->AsStr();
+      string::size_type pos = srec.find("\nVcs-");
+      if (pos != string::npos )
+      {
+        pos += strlen("\nVcs-");
+        string vcs = srec.substr(pos,srec.find(":",pos)-pos);
+        pos += vcs.length()+2;
+        string::size_type epos = srec.find("\n", pos);
+        string uri = srec.substr(pos,epos-pos).c_str();
+        ioprintf(c1out, _("WARNING: '%s' is maintained in "
+                          "the '%s' version control system at:\n"
+                          "'%s'\n"),
+                 Src.c_str(), vcs.c_str(), uri.c_str());
+        if(vcs == "Bzr") 
+           ioprintf(c1out,_("Please use: 'bzr get %s'\n"
+                            "to modify the package.\n"),
+                    uri.c_str());
+        ioprintf(c1out, "Are you sure you want to continue [yN]? ");
+        if(!YnPrompt(false))
+           return _error->Error(_("Abort."));
+      }
+
       // Back track
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false)

diff --git a/debian/changelog b/debian/changelog
index c86f8abbc8acf4c6214d0b359fb364a03fb80394..0482dff3c7703448569f8a8f455418227107745d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ apt (0.7.2ubuntu1) gutsy; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
     - apport integration added, this means that a apport
       report is written on dpkg failures
+  * cmdline/apt-get.cc:
+    - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
+      this will warn when Vcs- headers are found on apt-get source
+      (Fixes LP:#115959)
   * merged from debian/unstable, remaining changes:
     - maintainer field changed