Provide "apt-get full-upgrade" to match "apt full-upgrade"

[apt.git] / cmdline / apt-mark.cc

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index c5b7ca4962f87dfed3a18699d3f2eebfac248433..02c73fc2e4a04a73245ea8db6cf2997bde664f8a 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -11,29 +11,39 @@
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/fileutl.h>

 #include <apt-pkg/init.h>
 #include <apt-pkg/init.h>

-#include <apt-pkg/strutl.h>

 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgsystem.h>

-#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>
+
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-output.h>

 
 

-#include <algorithm>

 #include <errno.h>
 #include <errno.h>

-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>

 #include <fcntl.h>
 #include <fcntl.h>

+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;
 
 
 #include <apti18n.h>
                                                                        /*}}}*/
 using namespace std;
 

-ostream c0out(0);
-ostream c1out(0);
-ostream c2out(0);
-ofstream devnull("/dev/null");

 /* DoAuto - mark packages as automatically/manually installed          {{{*/
 /* DoAuto - mark packages as automatically/manually installed          {{{*/

-bool DoAuto(CommandLine &CmdL)
+static bool DoAuto(CommandLine &CmdL)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -80,7 +90,7 @@ bool DoAuto(CommandLine &CmdL)
 /* DoMarkAuto - mark packages as automatically/manually installed      {{{*/
 /* Does the same as DoAuto but tries to do it exactly the same why as
    the python implementation did it so it can be a drop-in replacement */
 /* DoMarkAuto - mark packages as automatically/manually installed      {{{*/
 /* Does the same as DoAuto but tries to do it exactly the same why as
    the python implementation did it so it can be a drop-in replacement */

-bool DoMarkAuto(CommandLine &CmdL)
+static bool DoMarkAuto(CommandLine &CmdL)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -117,7 +127,7 @@ bool DoMarkAuto(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)           {{{*/
 }
                                                                        /*}}}*/
 /* ShowAuto - show automatically installed packages (sorted)           {{{*/

-bool ShowAuto(CommandLine &CmdL)
+static bool ShowAuto(CommandLine &CmdL)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -157,7 +167,7 @@ bool ShowAuto(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 /* DoHold - mark packages as hold by dpkg                              {{{*/
 }
                                                                        /*}}}*/
 /* DoHold - mark packages as hold by dpkg                              {{{*/

-bool DoHold(CommandLine &CmdL)
+static bool DoHold(CommandLine &CmdL)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -202,13 +212,13 @@ bool DoHold(CommandLine &CmdL)
    if (dpkgAssertMultiArch == 0)
    {
       std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
    if (dpkgAssertMultiArch == 0)
    {
       std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");

-      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
-        _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --assert-multi-arch", chrootDir.c_str());

       // redirect everything to the ultimate sink as we only need the exit-status
       int const nullfd = open("/dev/null", O_RDONLY);
       dup2(nullfd, STDIN_FILENO);
       dup2(nullfd, STDOUT_FILENO);
       dup2(nullfd, STDERR_FILENO);
       // redirect everything to the ultimate sink as we only need the exit-status
       int const nullfd = open("/dev/null", O_RDONLY);
       dup2(nullfd, STDIN_FILENO);
       dup2(nullfd, STDOUT_FILENO);
       dup2(nullfd, STDERR_FILENO);

+      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)
+        _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --assert-multi-arch", chrootDir.c_str());

       execvp(Args[0], (char**) &Args[0]);
       _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
       _exit(2);
       execvp(Args[0], (char**) &Args[0]);
       _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
       _exit(2);


@@ -228,7 +238,7 @@ bool DoHold(CommandLine &CmdL)
            ioprintf(c1out,_("%s was already set on hold.\n"), Pkg.FullName(true).c_str());
         else
            ioprintf(c1out,_("%s was already not hold.\n"), Pkg.FullName(true).c_str());
            ioprintf(c1out,_("%s was already set on hold.\n"), Pkg.FullName(true).c_str());
         else
            ioprintf(c1out,_("%s was already not hold.\n"), Pkg.FullName(true).c_str());

-        Pkg = pkgset.erase(Pkg, true);
+        Pkg = pkgset.erase(Pkg);

       }
       else
         ++Pkg;
       }
       else
         ++Pkg;


@@ -264,6 +274,70 @@ bool DoHold(CommandLine &CmdL)
       return true;
    }
 
       return true;
    }
 

+   APT::PackageList keepoffset;
+   for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   {
+      if (Pkg->CurrentVer != 0)
+        continue;
+      keepoffset.insert(*Pkg);
+   }
+
+   if (keepoffset.empty() == false)
+   {
+      Args.erase(Args.begin() + BaseArgs, Args.end());
+      Args.push_back("--merge-avail");
+      // FIXME: supported only since 1.17.7 in dpkg
+      Args.push_back("-");
+      Args.push_back(NULL);
+
+      int external[2] = {-1, -1};
+      if (pipe(external) != 0)
+        return _error->WarningE("DoHold", "Can't create IPC pipe for dpkg --merge-avail");
+
+      pid_t dpkgMergeAvail = ExecFork();
+      if (dpkgMergeAvail == 0)
+      {
+        close(external[1]);
+        std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+        if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)
+           _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --merge-avail", chrootDir.c_str());
+        dup2(external[0], STDIN_FILENO);
+        int const nullfd = open("/dev/null", O_RDONLY);
+        dup2(nullfd, STDOUT_FILENO);
+        execvp(Args[0], (char**) &Args[0]);
+        _error->WarningE("dpkgGo", "Can't get dpkg --merge-avail running!");
+        _exit(2);
+      }
+
+      FILE* dpkg = fdopen(external[1], "w");
+      for (APT::PackageList::iterator Pkg = keepoffset.begin(); Pkg != keepoffset.end(); ++Pkg)
+      {
+        char const * Arch;
+        if (Pkg->VersionList != 0)
+           Arch = Pkg.VersionList().Arch();
+        else
+           Arch = Pkg.Arch();
+        fprintf(dpkg, "Package: %s\nVersion: 0~\nArchitecture: %s\nMaintainer: Dummy Example <dummy@example.org>\n"
+              "Description: dummy package record\n A record is needed to put a package on hold, so here it is.\n\n", Pkg.Name(), Arch);
+      }
+      fclose(dpkg);
+      keepoffset.clear();
+
+      if (dpkgMergeAvail > 0)
+      {
+        int Status = 0;
+        while (waitpid(dpkgMergeAvail, &Status, 0) != dpkgMergeAvail)
+        {
+           if (errno == EINTR)
+              continue;
+           _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --merge-avail");
+           break;
+        }
+        if (WIFEXITED(Status) == false || WEXITSTATUS(Status) != 0)
+           return _error->Error(_("Executing dpkg failed. Are you root?"));
+      }
+   }
+

    Args.erase(Args.begin() + BaseArgs, Args.end());
    Args.push_back("--set-selections");
    Args.push_back(NULL);
    Args.erase(Args.begin() + BaseArgs, Args.end());
    Args.push_back("--set-selections");
    Args.push_back(NULL);


@@ -277,14 +351,11 @@ bool DoHold(CommandLine &CmdL)
    {
       close(external[1]);
       std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
    {
       close(external[1]);
       std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");

-      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
+      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)

         _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --set-selections", chrootDir.c_str());
         _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --set-selections", chrootDir.c_str());

-      int const nullfd = open("/dev/null", O_RDONLY);

       dup2(external[0], STDIN_FILENO);
       dup2(external[0], STDIN_FILENO);

-      dup2(nullfd, STDOUT_FILENO);
-      dup2(nullfd, STDERR_FILENO);

       execvp(Args[0], (char**) &Args[0]);
       execvp(Args[0], (char**) &Args[0]);

-      _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
+      _error->WarningE("dpkgGo", "Can't get dpkg --set-selections running!");

       _exit(2);
    }
 
       _exit(2);
    }
 


@@ -333,7 +404,7 @@ bool DoHold(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 /* ShowHold - show packages set on hold in dpkg status                 {{{*/
 }
                                                                        /*}}}*/
 /* ShowHold - show packages set on hold in dpkg status                 {{{*/

-bool ShowHold(CommandLine &CmdL)
+static bool ShowHold(CommandLine &CmdL)

 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
 {
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();


@@ -370,10 +441,9 @@ bool ShowHold(CommandLine &CmdL)
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)

 {
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+   ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);

 
    cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 
    cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"


@@ -384,6 +454,11 @@ bool ShowHelp(CommandLine &CmdL)
       "Commands:\n"
       "   auto - Mark the given packages as automatically installed\n"
       "   manual - Mark the given packages as manually installed\n"
       "Commands:\n"
       "   auto - Mark the given packages as automatically installed\n"
       "   manual - Mark the given packages as manually installed\n"

+      "   hold - Mark a package as held back\n"
+      "   unhold - Unset a package set as held back\n"
+      "   showauto - Print the list of automatically installed packages\n"
+      "   showmanual - Print the list of manually installed packages\n"
+      "   showhold - Print the list of package on hold\n"

       "\n"
       "Options:\n"
       "  -h  This help text.\n"
       "\n"
       "Options:\n"
       "  -h  This help text.\n"


@@ -400,21 +475,6 @@ bool ShowHelp(CommandLine &CmdL)
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 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},
    CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
                                   {"auto",&DoAuto},
                                   {"manual",&DoAuto},


@@ -432,43 +492,16 @@ int main(int argc,const char *argv[])                                     /*{{{*/
                                   {"unmarkauto", &DoMarkAuto},
                                    {0,0}};
 
                                   {"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);
 
    // Set up gettext support
    setlocale(LC_ALL,"");
    textdomain(PACKAGE);
 

-   // Parse the command line and initialize the package library
-   CommandLine CmdL(Args,_config);
-   if (pkgInitConfig(*_config) == false ||
-       CmdL.Parse(argc,argv) == false ||
-       pkgInitSystem(*_config,_system) == false)
-   {
-      if (_config->FindB("version") == true)
-        ShowHelp(CmdL);
-      _error->DumpErrors();
-      return 100;
-   }
-
-   // See if the help should be shown
-   if (_config->FindB("help") == true ||
-       _config->FindB("version") == true ||
-       CmdL.FileSize() == 0)
-   {
-      ShowHelp(CmdL);
-      return 0;
-   }
+   CommandLine CmdL;
+   ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);

 
 

-   // Deal with stdout not being a tty
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
-
-   // Setup the output streams
-   c0out.rdbuf(cout.rdbuf());
-   c1out.rdbuf(cout.rdbuf());
-   c2out.rdbuf(cout.rdbuf());
-   if (_config->FindI("quiet",0) > 0)
-      c0out.rdbuf(devnull.rdbuf());
-   if (_config->FindI("quiet",0) > 1)
-      c1out.rdbuf(devnull.rdbuf());
+   InitOutput();

 
    // Match the operation
    CmdL.DispatchArg(Cmds);
 
    // Match the operation
    CmdL.DispatchArg(Cmds);