- ensure proper permissions in the extended_state file (LP#67037)

  - applied patch to (optionally) hide the auto-remove information
    (thanks to Frode M. Døving) (LP#69148)

2 files changed, 5 insertions, 3 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d1d6ab7b4..aa3f3f712 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1421,8 +1421,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
 {
    bool Debug = _config->FindI("Debug::pkgAutoRemove",false);
    bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false);
+   bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove");
    pkgDepCache::ActionGroup group(*Cache);
-   
 
    if(Debug)
       std::cout << "DoAutomaticRemove()" << std::endl;
@@ -1461,8 +1461,9 @@ bool DoAutomaticRemove(CacheFile &Cache)
 	 }
       }
    }
-   ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
-   if (!doAutoRemove && autoremovelist.size() > 0)
+   if (!hideAutoRemove) 
+      ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
+   if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0)
       c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
 
    // Now see if we destroyed anything
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 533ed8715..728f083dc 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -61,3 +61,4 @@ if __name__ == "__main__":
                 outfile.write(str(tagfile.Section)+"\n")
         # all done, rename the tmpfile
         os.rename(outfile.name, STATE_FILE)
+        os.chmod(outfile.name, 0644)