* Skip version check if a build-dependency is provided ...

Author: mdz
Date: 2003-07-22 03:00:19 GMT
* Skip version check if a build-dependency is provided by an installed package
(Closes: #126938)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 75d375453928526787af418573d9a9aae56ea082..c81538a23e94772738c7d6506270ec219a2fcdec 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.131 2003/07/22 01:49:26 mdz Exp $
+// $Id: apt-get.cc,v 1.132 2003/07/22 03:00:19 mdz Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -2093,25 +2093,32 @@ bool DoBuildDep(CommandLine &CmdL)
             * installed
             */
             pkgCache::PrvIterator Prv = Pkg.ProvidesList();
             * installed
             */
             pkgCache::PrvIterator Prv = Pkg.ProvidesList();

-            for (; Prv.end() != true; Prv++)
+            for (; Prv.end() != true; Prv++) {

               if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
                  break;
               if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
                  break;

+            }

             
             // Get installed version and version we are going to install
            pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
             
             // Get installed version and version we are going to install
            pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);

-           pkgCache::VerIterator CV = (*Cache)[Pkg].CandidateVerIter(*Cache);

 
 

-            for (; CV.end() != true; CV++)
-            {
-               if (Cache->VS().CheckDep(CV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
-                  break;
+            if (Prv.end() == true || (*D).Version != "") {
+                 /* We either have a versioned dependency (so a provides won't do)
+                    or nothing is providing this package */
+
+                 pkgCache::VerIterator CV = (*Cache)[Pkg].CandidateVerIter(*Cache);
+
+                 for (; CV.end() != true; CV++)
+                 {
+                      if (Cache->VS().CheckDep(CV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+                           break;
+                 }
+                 if (CV.end() == true)
+                      return _error->Error(_("%s dependency for %s cannot be satisfied "
+                                             "because no available versions of package %s "
+                                             "can satisfy version requirements"),
+                                           Last->BuildDepType((*D).Type),Src.c_str(),
+                                           (*D).Package.c_str());

             }
             }

-            if (CV.end() == true)
-              return _error->Error(_("%s dependency for %s cannot be satisfied "
-                                      "because no available versions of package %s "
-                                      "can satisfy version requirements"),
-                                     Last->BuildDepType((*D).Type),Src.c_str(),
-                                      (*D).Package.c_str());

 
             /*
             * TODO: if we depend on a version lower than what we already have 
 
             /*
             * TODO: if we depend on a version lower than what we already have 

diff --git a/debian/changelog b/debian/changelog
index 4c7da1d487f2ede78aa183382915ffb0942e0437..91c8b1d247ef3ea961f60072e36df92ebddd6876 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ apt (0.5.7) unstable; urgency=low
     libapt-pkg-dev section libdevel)
   * Silence the essential packages check if we are only downloading
     archives and not changing the system (Closes: #190862)
     libapt-pkg-dev section libdevel)
   * Silence the essential packages check if we are only downloading
     archives and not changing the system (Closes: #190862)

-  * 
+  * Skip version check if a build-dependency is provided by an installed package
+    (Closes: #126938)

 
  --
 
 
  --