merged lp:~donkult/apt/sid

[apt.git] / apt-pkg / deb / dpkgpm.cc

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 67291063c52d565d199eba2556f30247f0f0c084..aa0b04bd5a9ab0eac5c7a814d0783039e61e8f6b 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -675,17 +675,22 @@ bool pkgDPkgPM::OpenLog()
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {
         if (Cache[I].NewInstall())
-           install += I.Name() + string(" (") + Cache[I].CandVersion + string("), ");
+        {
+           install += I.FullName(false) + string(" (") + Cache[I].CandVersion;
+           if (Cache[I].Flags & pkgCache::Flag::Auto)
+              install+= ", automatic";
+           install += string("), ");
+        }
         else if (Cache[I].Upgrade())
-           upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
+           upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
         else if (Cache[I].Downgrade())
-           downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
+           downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
         else if (Cache[I].Delete())
         {
            if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
-              purge += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");      
+              purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");     
            else
-              remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), ");     
+              remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");            
         }
       }
       if (_config->Exists("Commandline::AsString") == true)