poldek: poldek/upgrade-dist.c - use same depsolver as for installa...

[mis]

Author: mis                          Date: Sun Jan 27 16:01:13 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- use same depsolver as for installation; return if nothing to do

---- Files affected:
poldek/poldek:
   upgrade-dist.c (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: poldek/poldek/upgrade-dist.c
diff -u poldek/poldek/upgrade-dist.c:1.5 poldek/poldek/upgrade-dist.c:1.6
--- poldek/poldek/upgrade-dist.c:1.5	Fri Jun 29 00:28:21 2007
+++ poldek/poldek/upgrade-dist.c	Sun Jan 27 17:01:08 2008
@@ -45,6 +45,7 @@
 #include "poldek_intern.h"
 #include "pm/pm.h"
 #include "install/install.h"
+#include "install3/install.h"
 
 int process_pkg(const struct pkg *dbpkg, struct poldek_ts *ts,
                 tn_hash *marked_h, int *nmarked)
@@ -163,8 +164,14 @@
     pkgdb_it_destroy(&it);
     n_hash_free(marked_h);
 
-    if (nmarked == 0)
+    if (nmarked == 0) {
         msgn(1, _("Nothing to do"));
-
-    return in_do_poldek_ts_install(ts);
+        return 1;
+    }
+    
+    if (ts->ctx->_depsolver != 3)
+        return in_do_poldek_ts_install(ts);
+    
+    msgn(5, "Running #3 dependency engine...");
+    return i3_do_poldek_ts_install(ts);
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/upgrade-dist.c?r1=1.5&r2=1.6&f=u