diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-17 10:07:20 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-17 10:07:20 +0200 |
| commit | 1afd369d00f2f9272462ffc6c6e24f293a81459e (patch) | |
| tree | c29c1671aceaf9055b6c89d1befab91fe375c32a /cmdline/apt-mark.cc | |
| parent | 43ffe2d15bfff049d1ffe10c7696c008495f5912 (diff) | |
| parent | b44c98f9d80ac59f6602e16e6aedd3a8f9f9485a (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
cmdline/apt-get.cc
debian/changelog
Diffstat (limited to 'cmdline/apt-mark.cc')
| -rw-r--r-- | cmdline/apt-mark.cc | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 4c0fc2893..eb3410be1 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -24,6 +24,8 @@ #include <sys/wait.h> #include <fcntl.h> +#include <apt-private/private-cmndline.h> + #include <apti18n.h> /*}}}*/ using namespace std; @@ -400,21 +402,6 @@ bool ShowHelp(CommandLine &CmdL) /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {0,"version","version",0}, - {'q',"quiet","quiet",CommandLine::IntLevel}, - {'q',"silent","quiet",CommandLine::IntLevel}, - {'v',"verbose","APT::MarkAuto::Verbose",0}, - {'s',"simulate","APT::Mark::Simulate",0}, - {'s',"just-print","APT::Mark::Simulate",0}, - {'s',"recon","APT::Mark::Simulate",0}, - {'s',"dry-run","APT::Mark::Simulate",0}, - {'s',"no-act","APT::Mark::Simulate",0}, - {'f',"file","Dir::State::extended_states",CommandLine::HasArg}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp}, {"auto",&DoAuto}, {"manual",&DoAuto}, @@ -432,12 +419,14 @@ int main(int argc,const char *argv[]) /*{{{*/ {"unmarkauto", &DoMarkAuto}, {0,0}}; + std::vector<CommandLine::Args> Args = getCommandArgs("apt-mark", CommandLine::GetCommand(Cmds, argc, argv)); + // Set up gettext support setlocale(LC_ALL,""); textdomain(PACKAGE); // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); + CommandLine CmdL(Args.data(),_config); if (pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false || pkgInitSystem(*_config,_system) == false) |