diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-10 09:45:41 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-10 09:45:41 +0200 |
| commit | 6311c8d25f1ff2033ef48a20fc7942ef42d81bf8 (patch) | |
| tree | 24768b1ed49484226ef10b0f7cd0e9bad7941758 | |
| parent | c11e2d67cef10629cf927d7f1a725e7bb094f266 (diff) | |
| download | apt-6311c8d25f1ff2033ef48a20fc7942ef42d81bf8.tar.gz | |
apt-mark: Add hidden showheld alias for showhold
For Unit193 and those who value grammar, I suppose.
| -rw-r--r-- | apt-private/private-cmndline.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-mark.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 494928332..3a25c7131 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -286,7 +286,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("auto", "manual", "hold", "unhold", "showauto", - "showmanual", "showhold", "showholds", + "showmanual", "showhold", "showholds", "showheld", "markauto", "unmarkauto", "minimize-manual")) { addArg('f',"file","Dir::State::extended_states",CommandLine::HasArg); diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 161845b53..942f58f0f 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -365,7 +365,7 @@ static bool ShowSelection(CommandLine &CmdL) /*{{{*/ else if (strncasecmp(CmdL.FileList[0], "showdeinstall", strlen("showdeinstall")) == 0 || strncasecmp(CmdL.FileList[0], "showremove", strlen("showremove")) == 0) selector = pkgCache::State::DeInstall; - else if (strncasecmp(CmdL.FileList[0], "showhold", strlen("showhold")) == 0) + else if (strncasecmp(CmdL.FileList[0], "showhold", strlen("showhold")) == 0 || strncasecmp(CmdL.FileList[0], "showheld", strlen("showheld")) == 0) selector = pkgCache::State::Hold; else //if (strcasecmp(CmdL.FileList[0], "showinstall", strlen("showinstall")) == 0) selector = pkgCache::State::Install; @@ -423,7 +423,7 @@ static std::vector<aptDispatchWithHelp> GetCommands() /*{{{*/ {"purge",&DoSelection, nullptr}, {"showauto",&ShowAuto, _("Print the list of automatically installed packages")}, {"showmanual",&ShowAuto, _("Print the list of manually installed packages")}, - {"showhold",&ShowSelection, _("Print the list of packages on hold")}, {"showholds",&ShowSelection, nullptr}, + {"showhold",&ShowSelection, _("Print the list of packages on hold")}, {"showholds",&ShowSelection, nullptr}, {"showheld",&ShowSelection, nullptr}, {"showinstall",&ShowSelection, nullptr}, {"showinstalls",&ShowSelection, nullptr}, {"showdeinstall",&ShowSelection, nullptr}, {"showdeinstalls",&ShowSelection, nullptr}, {"showremove",&ShowSelection, nullptr}, {"showremoves",&ShowSelection, nullptr}, |