Browse Source

Merge branch 'master' into 'master'

Support marking all newly installed packages as automatically installed

See merge request apt-team/apt!110
tags/debian/2.1.8
Julian Andres Klode 2 months ago
parent
commit
63c0657ea5
4 changed files with 14 additions and 1 deletions
  1. +2
    -1
      apt-pkg/depcache.cc
  2. +1
    -0
      apt-private/private-cmndline.cc
  3. +10
    -0
      doc/apt-get.8.xml
  4. +1
    -0
      doc/examples/configure-index

+ 2
- 1
apt-pkg/depcache.cc View File

@@ -1156,6 +1156,7 @@ struct CompareProviders /*{{{*/
/*}}}*/
bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool AutoInst, bool FromUser) /*{{{*/
{
bool AlwaysMarkAsAuto = _config->FindB("APT::Get::Mark-Auto", false) == true;
auto &P = (*this)[Pkg];
if (P.Protect() && P.InstallVer == P.CandidateVer)
return true;
@@ -1171,7 +1172,7 @@ bool pkgDepCache::MarkInstall_StateChange(pkgCache::PkgIterator const &Pkg, bool
P.Mode = pkgDepCache::ModeInstall;
P.InstallVer = P.CandidateVer;

if(FromUser)
if(FromUser && !AlwaysMarkAsAuto)
{
// Set it to manual if it's a new install or already installed,
// but only if its not marked by the autoremover (aptitude depend on this behavior)


+ 1
- 0
apt-private/private-cmndline.cc View File

@@ -276,6 +276,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
addArg(0,"force-yes","APT::Get::force-yes",0);
addArg(0,"print-uris","APT::Get::Print-URIs",0);
addArg(0,"trivial-only","APT::Get::Trivial-Only",0);
addArg(0,"mark-auto","APT::Get::Mark-Auto",0);
addArg(0,"remove","APT::Get::Remove",0);
addArg(0,"only-source","APT::Get::Only-Source",0);
addArg(0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0);


+ 10
- 0
doc/apt-get.8.xml View File

@@ -545,6 +545,16 @@
Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
</varlistentry>

<varlistentry><term><option>--mark-auto</option></term>
<listitem><para>
After successful installation, mark all freshly installed packages as
automatically installed, which will cause each of the packages to be
removed when no more manually installed packages depend on this package.
This is equally to running <command>apt-mark auto</command> for all
installed packages.
Configuration Item: <literal>APT::Get::Mark-Auto</literal>.</para></listitem>
</varlistentry>

<varlistentry><term><option>--no-remove</option></term>
<listitem><para>If any packages are to be removed apt-get immediately aborts without
prompting.


+ 1
- 0
doc/examples/configure-index View File

@@ -73,6 +73,7 @@ APT
Assume-Yes "<BOOL>"; // not as dangerous, but use with care still
Assume-No "<BOOL>";
Trivial-Only "<BOOL>";
Mark-Auto "<BOOL>";
Remove "<BOOL>";
AllowUnauthenticated "<BOOL>"; // skip security



Loading…
Cancel
Save