deal with spaces in path, command and filepaths in apt-key

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

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 8974397c94e61f21add4fcef477302bbe6b8355b..02c73fc2e4a04a73245ea8db6cf2997bde664f8a 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -238,7 +238,7 @@ static 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());
-        Pkg = pkgset.erase(Pkg, true);
+        Pkg = pkgset.erase(Pkg);
       }
       else
         ++Pkg;
@@ -279,7 +279,7 @@ static bool DoHold(CommandLine &CmdL)
    {
       if (Pkg->CurrentVer != 0)
         continue;
-      keepoffset.insert(Pkg);
+      keepoffset.insert(*Pkg);
    }
 
    if (keepoffset.empty() == false)
@@ -443,8 +443,7 @@ static bool ShowHold(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"