r372 - in trunk: debian src

[Otavio Salvador]

Author: otavio
Date: Thu Nov 25 13:10:58 2004
New Revision: 372

Modified:
   trunk/debian/changelog
   trunk/src/RemotePackages.py
Log:
Revert virtual-package handle change.

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Nov 25 13:10:58 2004
@@ -2,7 +2,6 @@
 
   * NOT RELEASED YET
   * Fix some spelling errors.
-  * Improve the virtual-package handle a lot.
 
  -- Otavio Salvador <otavio@debian.org>  Fri,  2 Jul 2004 10:39:31 -0300
 

Modified: trunk/src/RemotePackages.py
==============================================================================
--- trunk/src/RemotePackages.py	(original)
+++ trunk/src/RemotePackages.py	Thu Nov 25 13:10:58 2004
@@ -105,6 +105,9 @@
             for d in self.__remote_packages[filename][name].getDepends():
                 if self.__remote_packages[filename].has_key(d):
                     self.__selectPackage(d, filename, [{'section': '*', 'priority': '*', 'package': '*'}], False)
+                if self.__getProvides and self.__provided_or_replaced_packages.has_key(d):
+                    for p in self.__provided_or_replaced_packages[d]:
+                        self.__selectPackage(p.getName(), filename, [{'section': '*', 'priority': '*', 'package': '*'}], True)
 
             if getAll:
                 if self.__getSuggests:
@@ -114,15 +117,10 @@
                 if self.__getRecomends:
                     for r in self.__remote_packages[filename][name].getRecomends():
                         self.__selectPackage(r, filename, [{'section': '*', 'priority': '*', 'package': '*'}], False)
-
-            return True
-        
-        # Handle virtual-packages!
-        if self.__getProvides and self.__provided_or_replaced_packages.has_key(name):
-            for i in self.__provided_or_replaced_packages[name]:
-                self.__selectPackage(i.getName(), filename, [{'section': '*', 'priority': '*', 'package': '*'}], getAll)
+                    
             return True
-        return False
+        else:
+            return False
 
     # Check if we should add this package
     def __check(self, name, filename, rules):