summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-04-21 17:00:37 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-04-21 17:00:37 +0200
commit182a6a557492ddbb4320b0c620e19071bd1014c3 (patch)
tree9d38b1eb94dd44897fefedb4d2e5f8fdf8a8fad6
parentc98fb5e00d4b8a7e0c372e9cbc857046dec3b3dd (diff)
* cmdline/apt-get.cc:
- deprecate mostly undocumented 'markauto' in favor of 'apt-mark' * cmdline/apt-cache.cc: - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
-rw-r--r--cmdline/apt-cache.cc7
-rw-r--r--cmdline/apt-get.cc9
-rw-r--r--debian/changelog6
3 files changed, 13 insertions, 9 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 34f8a1a75..f66c22c20 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1334,9 +1334,8 @@ bool Search(CommandLine &CmdL)
return _error->Error("Write to stdout failed");
return true;
}
-
-
-/* show automatically installed packages (sorted) */
+ /*}}}*/
+/* ShowAuto - show automatically installed packages (sorted) {{{*/
bool ShowAuto(CommandLine &CmdL)
{
pkgCacheFile CacheFile;
@@ -1357,6 +1356,7 @@ bool ShowAuto(CommandLine &CmdL)
for (vector<string>::iterator I = packages.begin(); I != packages.end(); I++)
cout << *I << "\n";
+ _error->Notice(_("This command is deprecated. Please use 'apt-mark showauto' instead."));
return true;
}
/*}}}*/
@@ -1702,7 +1702,6 @@ bool ShowHelp(CommandLine &Cmd)
" unmet - Show unmet dependencies\n"
" search - Search the package list for a regex pattern\n"
" show - Show a readable record for the package\n"
- " showauto - Display a list of automatically installed packages\n"
" depends - Show raw dependency information for a package\n"
" rdepends - Show reverse dependency information for a package\n"
" pkgnames - List the names of all packages in the system\n"
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 38003e430..845c92026 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2050,8 +2050,8 @@ bool DoInstall(CommandLine &CmdL)
return InstallPackages(Cache,false);
}
-
-/* mark packages as automatically/manually installed. */
+ /*}}}*/
+/* mark packages as automatically/manually installed. {{{*/
bool DoMarkAuto(CommandLine &CmdL)
{
bool Action = true;
@@ -2086,6 +2086,9 @@ bool DoMarkAuto(CommandLine &CmdL)
AutoMarkChanged++;
}
}
+
+ _error->Notice(_("This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' instead."));
+
if (AutoMarkChanged && ! _config->FindB("APT::Get::Simulate",false))
return Cache->writeStateFile(NULL);
return false;
@@ -3184,8 +3187,6 @@ bool ShowHelp(CommandLine &CmdL)
" clean - Erase downloaded archive files\n"
" autoclean - Erase old downloaded archive files\n"
" check - Verify that there are no broken dependencies\n"
- " markauto - Mark the given packages as automatically installed\n"
- " unmarkauto - Mark the given packages as manually installed\n"
" changelog - Download and display the changelog for the given package\n"
" download - Download the binary package into the current directory\n"
"\n"
diff --git a/debian/changelog b/debian/changelog
index 1658bd094..84db2eec4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,12 @@ apt (0.8.14.2) UNRELEASED; urgency=low
- remove unused embedded jquery by doxygen from libapt-pkg-doc
* cmdline/apt-mark.cc:
- reimplement apt-mark in c++
+ * cmdline/apt-get.cc:
+ - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+ * cmdline/apt-cache.cc:
+ - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
- -- David Kalnischkies <kalnischkies@gmail.com> Thu, 21 Apr 2011 16:43:16 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 21 Apr 2011 16:57:41 +0200
apt (0.8.14.1) unstable; urgency=low