Quellcode durchsuchen

* cmdline/apt-get.cc:
- remove YnPrompt when a XS-Vcs- tag is found, improve the
notice (LP: #129575)

Michael Vogt vor 19 Jahren
Ursprung
Commit
b799e134fc
3 geänderte Dateien mit 14 neuen und 9 gelöschten Zeilen
  1. 4 7
      cmdline/apt-get.cc
  2. 1 1
      configure.in
  3. 9 1
      debian/changelog

+ 4 - 7
cmdline/apt-get.cc

@@ -2130,20 +2130,17 @@ bool DoSource(CommandLine &CmdL)
 	 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 "
+	 ioprintf(c1out, _("NOTICE: '%s' packaging 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:\n"
 			     "bzr get %s\n"
-			     "to modify the package.\n"),
+			     "to retrieve the latest (possible unreleased) "
+			     "updates to the package.\n"),
 		     uri.c_str());
-	 ioprintf(c1out, "Are you sure you want to continue [yN]? ");
-	 if(!YnPrompt(false))
-	    return _error->Error(_("Abort."));
-	 else 
-	    break;
+	 break;
       }
 
       // Back track

+ 1 - 1
configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu2")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu3")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

+ 9 - 1
debian/changelog

@@ -1,3 +1,11 @@
+apt (0.7.6ubuntu4) gutsy; urgency=low
+
+  * cmdline/apt-get.cc:
+    - remove YnPrompt when a XS-Vcs- tag is found, improve the
+      notice (LP: #129575)
+
+ --
+
 apt (0.7.6ubuntu3) gutsy; urgency=low
 
   * apt-pkg/deb/dpkgpm.cc:
@@ -5,7 +13,7 @@ apt (0.7.6ubuntu3) gutsy; urgency=low
   * apt-pkg/pkgcachegen.cc:
     - increase default mmap size (LP: #125640)
 
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 
 apt (0.7.6ubuntu2) gutsy; urgency=low