diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-08 12:52:56 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-08 12:52:56 +0200 |
| commit | b799e134fc730519cc8f0c0ea4387badffac4092 (patch) | |
| tree | 29465ced916093a4bcc1a3ad880c0a01d2a21573 | |
| parent | c05b6385ee33b72927c229b5279ee2f5383ad414 (diff) | |
* cmdline/apt-get.cc:
- remove YnPrompt when a XS-Vcs- tag is found, improve the
notice (LP: #129575)
| -rw-r--r-- | cmdline/apt-get.cc | 11 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 |
3 files changed, 14 insertions, 9 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ead053136..e7b7d5204 100644 --- a/cmdline/apt-get.cc +++ b/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 diff --git a/configure.in b/configure.in index b2f10baed..d1a684eb2 100644 --- a/configure.in +++ b/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) diff --git a/debian/changelog b/debian/changelog index 6861a1ba8..c4eba136f 100644 --- a/debian/changelog +++ b/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 |