implement proper progress report with OpProgress

[apt.git] / apt-pkg / policy.cc

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 9b24c2ef183dad1b8fe7e26f50e94e836055c4e6..4e4077feb3a5dafcda09003ccb00ca0f3e790f66 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -16,7 +16,7 @@
    990         = Config file override package files
    989         = Start for preference auto-priorities
    500         = Default package files
    990         = Config file override package files
    989         = Start for preference auto-priorities
    500         = Default package files

-   100         = The status file
+   100         = The status file and ButAutomaticUpgrades sources

    0 -> 100    = NotAutomatic sources like experimental
    -inf -> 0   = Never selected   
    
    0 -> 100    = NotAutomatic sources like experimental
    -inf -> 0   = Never selected   
    


@@ -45,6 +45,8 @@ using namespace std;
    file matches the V0 policy engine. */
 pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
 {
    file matches the V0 policy engine. */
 pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
 {

+   if (Owner == 0 || &(Owner->Head()) == 0)
+      return;

    PFPriority = new signed short[Owner->Head().PackageFileCount];
    Pins = new Pin[Owner->Head().PackageCount];
 
    PFPriority = new signed short[Owner->Head().PackageFileCount];
    Pins = new Pin[Owner->Head().PackageCount];
 


@@ -70,9 +72,10 @@ bool pkgPolicy::InitDefaults()
       PFPriority[I->ID] = 500;
       if ((I->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
         PFPriority[I->ID] = 100;
       PFPriority[I->ID] = 500;
       if ((I->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
         PFPriority[I->ID] = 100;

-      else
-        if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
-           PFPriority[I->ID] = 1;
+      else if ((I->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
+        PFPriority[I->ID] = 100;
+      else if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
+        PFPriority[I->ID] = 1;

    }
 
    // Apply the defaults..
    }
 
    // Apply the defaults..


@@ -106,7 +109,7 @@ bool pkgPolicy::InitDefaults()
 
    if (_config->FindB("Debug::pkgPolicy",false) == true)
       for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)
 
    if (_config->FindB("Debug::pkgPolicy",false) == true)
       for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++)

-        cout << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << endl; 
+        std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl; 

    
    return true;   
 }
    
    return true;   
 }


@@ -115,7 +118,7 @@ bool pkgPolicy::InitDefaults()
 // ---------------------------------------------------------------------
 /* Evaluate the package pins and the default list to deteremine what the
    best package is. */
 // ---------------------------------------------------------------------
 /* Evaluate the package pins and the default list to deteremine what the
    best package is. */

-pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
+pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg)

 {
    // Look for a package pin and evaluate it.
    signed Max = GetPriority(Pkg);
 {
    // Look for a package pin and evaluate it.
    signed Max = GetPriority(Pkg);


@@ -147,6 +150,9 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
     */
    for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++)
    {
     */
    for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++)
    {

+      /* Lets see if this version is the installed version */
+      bool instVer = (Pkg.CurrentVer() == Ver);
+

       for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
       {
         /* If this is the status file, and the current version is not the
       for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
       {
         /* If this is the status file, and the current version is not the


@@ -155,9 +161,9 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
            out bogus entries that may be due to config-file states, or
            other. */
         if ((VF.File()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource &&
            out bogus entries that may be due to config-file states, or
            other. */
         if ((VF.File()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource &&

-            Pkg.CurrentVer() != Ver)
+            instVer == false)

            continue;
            continue;

-                        
+

         signed Prio = PFPriority[VF.File()->ID];
         if (Prio > Max)
         {
         signed Prio = PFPriority[VF.File()->ID];
         if (Prio > Max)
         {


@@ -171,7 +177,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
         }       
       }      
       
         }       
       }      
       

-      if (Pkg.CurrentVer() == Ver && Max < 1000)
+      if (instVer == true && Max < 1000)

       {
         /* Elevate our current selection (or the status file itself)
            to the Pseudo-status priority. */
       {
         /* Elevate our current selection (or the status file itself)
            to the Pseudo-status priority. */


@@ -189,6 +195,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg)
    // will always be a candidate (Closes: #512318)
    if (!Pref.IsGood() && MaxAlt > 0)
        Pref = PrefAlt;
    // will always be a candidate (Closes: #512318)
    if (!Pref.IsGood() && MaxAlt > 0)
        Pref = PrefAlt;

+

    return Pref;
 }
                                                                        /*}}}*/
    return Pref;
 }
                                                                        /*}}}*/


@@ -238,15 +245,14 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
 // Policy::GetMatch - Get the matching version for a package pin       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Policy::GetMatch - Get the matching version for a package pin       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator Pkg)
+pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg)

 {
    const Pin &PPkg = Pins[Pkg->ID];
 {
    const Pin &PPkg = Pins[Pkg->ID];

-   if (PPkg.Type != pkgVersionMatch::None)
-   {
-      pkgVersionMatch Match(PPkg.Data,PPkg.Type);
-      return Match.Find(Pkg);
-   }
-   return pkgCache::VerIterator(*Pkg.Cache());
+   if (PPkg.Type == pkgVersionMatch::None)
+      return pkgCache::VerIterator(*Pkg.Cache());
+
+   pkgVersionMatch Match(PPkg.Data,PPkg.Type);
+   return Match.Find(Pkg);

 }
                                                                        /*}}}*/
 // Policy::GetPriority - Get the priority of the package pin           /*{{{*/
 }
                                                                        /*}}}*/
 // Policy::GetPriority - Get the priority of the package pin           /*{{{*/


@@ -263,6 +269,10 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
    }
    
    return 0;
    }
    
    return 0;

+}
+signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
+{
+   return PFPriority[File->ID];

 }
                                                                        /*}}}*/
 // PreferenceSection class - Overriding the default TrimRecord method  /*{{{*/
 }
                                                                        /*}}}*/
 // PreferenceSection class - Overriding the default TrimRecord method  /*{{{*/


@@ -291,9 +301,9 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
    if (Dir.empty() == true)
       Dir = _config->FindDir("Dir::Etc::PreferencesParts");
 
    if (Dir.empty() == true)
       Dir = _config->FindDir("Dir::Etc::PreferencesParts");
 

-   if (FileExists(Dir) == false)
+   if (DirectoryExists(Dir) == false)

    {
    {

-      _error->WarningE("FileExists",_("Unable to read %s"),Dir.c_str());
+      _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());

       return true;
    }
 
       return true;
    }
 


@@ -317,7 +327,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
    if (File.empty() == true)
       File = _config->FindFile("Dir::Etc::Preferences");
 
    if (File.empty() == true)
       File = _config->FindFile("Dir::Etc::Preferences");
 

-   if (FileExists(File) == false)
+   if (RealFileExists(File) == false)

       return true;
    
    FileFd Fd(File,FileFd::ReadOnly);
       return true;
    
    FileFd Fd(File,FileFd::ReadOnly);