Просмотр исходного кода

* 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)

Michael Vogt лет назад: 19
Родитель
Сommit
f2125ef16e
2 измененных файлов с 26 добавлено и 0 удалено
  1. 22 0
      cmdline/apt-get.cc
  2. 4 0
      debian/changelog

+ 22 - 0
cmdline/apt-get.cc

@@ -2114,6 +2114,28 @@ bool DoSource(CommandLine &CmdL)
       if (Last == 0)
       if (Last == 0)
 	 return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
 	 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
       // Back track
       vector<pkgSrcRecords::File> Lst;
       vector<pkgSrcRecords::File> Lst;
       if (Last->Files(Lst) == false)
       if (Last->Files(Lst) == false)

+ 4 - 0
debian/changelog

@@ -3,6 +3,10 @@ apt (0.7.2ubuntu1) gutsy; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
   * apt-pkg/deb/dpkgpm.cc:
     - apport integration added, this means that a apport
     - apport integration added, this means that a apport
       report is written on dpkg failures
       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:
   * merged from debian/unstable, remaining changes:
     - maintainer field changed
     - maintainer field changed