diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
| commit | e2264d3f957694e229a9f6976fc136b8f82ad770 (patch) | |
| tree | c1f0b9c64d1d60defe5ce1a89c6bc136d758a772 /cmdline/apt.cc | |
| parent | fd4e73c33c20873af670ee40b549c46ee0d50801 (diff) | |
| parent | c9a5f74bd57fa4fcf4e30cade8e48c5635448689 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'cmdline/apt.cc')
| -rw-r--r-- | cmdline/apt.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmdline/apt.cc b/cmdline/apt.cc index e30967ec2..4bcae0aba 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -41,6 +41,7 @@ #include <apt-pkg/pkgsystem.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/metaindex.h> +#include <apt-pkg/hashes.h> #include <apti18n.h> @@ -54,8 +55,12 @@ #include <apt-private/private-upgrade.h> #include <apt-private/private-show.h> #include <apt-private/private-main.h> +#include <apt-private/private-utils.h> +#include <apt-private/private-sources.h> /*}}}*/ + + bool ShowHelp(CommandLine &CmdL) { ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, @@ -74,6 +79,8 @@ bool ShowHelp(CommandLine &CmdL) " update - update list of available packages\n" " install - install packages\n" " upgrade - upgrade the systems packages\n" + "\n" + " edit-sources - edit the source information file\n" ); return true; @@ -89,6 +96,8 @@ int main(int argc, const char *argv[]) /*{{{*/ {"remove", &DoInstall}, {"update",&DoUpdate}, {"upgrade",&DoUpgradeWithAllowNewPackages}, + // misc + {"edit-sources",&EditSources}, // helper {"moo",&DoMoo}, {"help",&ShowHelp}, |