* make eager upgrades optional via --eager flag

pisi/cli/commands.py

@@ -399,6 +399,8 @@ reinstall a package from a pisi file, use the install command."""
     def options(self):
         super(Upgrade, self).options()
         buildno_opts(self)
+        self.parser.add_option("-e", "--eager", action="store_true",
+                               default=False, help=_("eager upgrades"))
 
     def run(self):
         if not self.args:

pisi/operations.py

@@ -181,6 +181,9 @@ def install_pkg_names(A):
         G_f.add_package(x)
     B = A
     #state = {}
+    
+    #TODO: conflicts
+    
     while len(B) > 0:
         Bp = set()
         for x in B:
@@ -267,6 +270,23 @@ version %s, release %s, build %s.')
         G_f.add_package(x)
     B = A
     #state = {}
+    
+    def upgradable(dep):
+        #pre dep.package is installed
+        (v,r,b) = ctx.installdb.get_version(dep.package)
+        rep_pkg = packagedb.get_package(dep.package)
+        (vp,rp,bp) = (rep_pkg.version, rep_pkg.release, 
+                      rep_pkg.build)
+        if ignore_build or (not b) or (not bp):
+            # if we can't look at build
+            if r >= rp:     # installed already new
+                return False
+        elif b and bp and b >= bp:
+            return False
+        return True
+
+    # TODO: conflicts
+
     while len(B) > 0:
         Bp = set()
         for x in B:
@@ -276,16 +296,13 @@ version %s, release %s, build %s.')
                 #print 'checking ', dep
                 # add packages that can be upgraded
                 if dependency.repo_satisfies_dep(dep):
+                    #TODO: distinguish must upgrade and upgradable
                     if ctx.installdb.is_installed(dep.package):
-                        (v,r,b) = ctx.installdb.get_version(dep.package)
+                        if not ctx.get_option('eager'):
-                        rep_pkg = packagedb.get_package(dep.package)
+                            if dependency.installed_satisfies_dep(dep):
-                        (vp,rp,bp) = (rep_pkg.version, rep_pkg.release, 
-                                      rep_pkg.build)
-                        if ignore_build or (not b) or (not bp):
-                            # if we can't look at build
-                            if r >= rp:     # installed already new
                                 continue
-                        elif b and bp and b >= bp:
+                        else:
+                            if not upgradable(dep):
                                 continue
                     if not dep.package in G_f.vertices():
                         Bp.add(str(dep.package))