poldek: poldek/Makefile.am, poldek/configure.in, poldek/poldek_ts.c, poldek...
mis
mis at pld-linux.org
Mon May 12 17:51:43 CEST 2008
Author: mis Date: Mon May 12 15:51:43 2008 GMT
Module: poldek Tag: HEAD
---- Log message:
- removed old depsolver
---- Files affected:
poldek/poldek:
Makefile.am (1.98 -> 1.99) , configure.in (1.144 -> 1.145) , poldek_ts.c (1.72 -> 1.73) , upgrade-dist.c (1.7 -> 1.8)
poldek/poldek/install:
Makefile.am (1.3 -> NONE) (REMOVED), conflicts.c (1.9 -> NONE) (REMOVED), dbdep.c (1.2 -> NONE) (REMOVED), dbdep.h (1.1 -> NONE) (REMOVED), dbpkgset.c (1.1 -> NONE) (REMOVED), dbpkgset.h (1.1 -> NONE) (REMOVED), icaps.c (1.6 -> NONE) (REMOVED), ictx.c (1.3 -> NONE) (REMOVED), ictx.h (1.6 -> NONE) (REMOVED), install.c (1.11 -> NONE) (REMOVED), install.h (1.3 -> NONE) (REMOVED), mark.c (1.4 -> NONE) (REMOVED), misc.c (1.15 -> NONE) (REMOVED), obsoletes.c (1.11 -> NONE) (REMOVED), process.c (1.2 -> NONE) (REMOVED), requirements.c (1.13 -> NONE) (REMOVED)
poldek/poldek/po:
POTFILES.in (1.34 -> 1.35)
---- Diffs:
================================================================
Index: poldek/poldek/Makefile.am
diff -u poldek/poldek/Makefile.am:1.98 poldek/poldek/Makefile.am:1.99
--- poldek/poldek/Makefile.am:1.98 Tue Jan 22 13:44:03 2008
+++ poldek/poldek/Makefile.am Mon May 12 17:51:38 2008
@@ -8,7 +8,7 @@
CLI=cli
SUBDIRS = po doc $(TRURL_DIR) $(TNDB_DIR) sigint vfile conf pkgdir \
- pm install3 install . $(CLI)
+ pm install3 . $(CLI)
DIST_SUBDIRS = $(SUBDIRS) python tests
INCLUDES = @TRURL_INCLUDE@ @TNDB_INCLUDE@
@@ -70,7 +70,6 @@
libpoldek_la_LIBADD = \
sigint/libsigint.la \
pkgdir/libpkgdir.la \
- install/libinstall.la \
install3/libinstall3.la \
pm/libpm.la \
vfile/libvfile.la
================================================================
Index: poldek/poldek/configure.in
diff -u poldek/poldek/configure.in:1.144 poldek/poldek/configure.in:1.145
--- poldek/poldek/configure.in:1.144 Sun Feb 24 23:40:43 2008
+++ poldek/poldek/configure.in Mon May 12 17:51:38 2008
@@ -543,7 +543,6 @@
doc/Makefile
doc/homepage/Makefile
doc/pl/Makefile
- install/Makefile
install3/Makefile
Makefile
poldek.spec
================================================================
Index: poldek/poldek/poldek_ts.c
diff -u poldek/poldek/poldek_ts.c:1.72 poldek/poldek/poldek_ts.c:1.73
--- poldek/poldek/poldek_ts.c:1.72 Thu Jan 31 02:39:14 2008
+++ poldek/poldek/poldek_ts.c Mon May 12 17:51:38 2008
@@ -38,7 +38,6 @@
#include "misc.h"
#include "log.h"
#include "i18n.h"
-#include "install/install.h"
#include "fileindex.h"
extern int poldek_conf_PROMOTE_EPOCH;
@@ -937,7 +936,6 @@
return rc;
}
-extern int in_do_poldek_ts_instal(struct poldek_ts *ts);
extern int i3_do_poldek_ts_install(struct poldek_ts *ts);
static int ts_run_install(struct poldek_ts *ts)
@@ -967,14 +965,7 @@
pkgdb_tx_begin(ts->db, ts);
DBGF("0 arg_packages_size=%d\n", arg_packages_size(ts->aps));
- if (ts->ctx->_depsolver == 3) { /* hope, soon */
- msgn(5, "Running #3 dependency engine...");
- rc = i3_do_poldek_ts_install(ts);
-
- } else {
- rc = in_do_poldek_ts_install(ts);
- }
-
+ rc = i3_do_poldek_ts_install(ts);
if (rc && !ts->getop(ts, POLDEK_OP_RPMTEST))
pkgdb_tx_commit(ts->db);
================================================================
Index: poldek/poldek/upgrade-dist.c
diff -u poldek/poldek/upgrade-dist.c:1.7 poldek/poldek/upgrade-dist.c:1.8
--- poldek/poldek/upgrade-dist.c:1.7 Sat Feb 2 22:49:04 2008
+++ poldek/poldek/upgrade-dist.c Mon May 12 17:51:38 2008
@@ -44,7 +44,6 @@
#include "poldek.h"
#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,
@@ -168,10 +167,6 @@
msgn(1, _("Nothing to do"));
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);
}
================================================================
Index: poldek/poldek/po/POTFILES.in
diff -u poldek/poldek/po/POTFILES.in:1.34 poldek/poldek/po/POTFILES.in:1.35
--- poldek/poldek/po/POTFILES.in:1.34 Mon Jan 14 09:51:08 2008
+++ poldek/poldek/po/POTFILES.in Mon May 12 17:51:39 2008
@@ -31,23 +31,25 @@
cli/test_cli.c
cli/uninstall.c
conf.c
+conf_sections.c
depdirs.c
fileindex.c
install-dist.c
-install/conflicts.c
-install/dbdep.c
-install/dbpkgset.c
-install/icaps.c
-install/ictx.c
-install/install.c
-install/mark.c
-install/misc.c
-install/obsoletes.c
-install/process.c
-install/requirements.c
+install3/conflicts.c
+install3/ictx.c
+install3/install.c
+install3/iset.c
+install3/mark.c
+install3/misc.c
+install3/obsoletes.c
+install3/preinstall.c
+install3/process.c
+install3/requirements.c
lib_init.c
lib_pkgset.c
log.c
+log4c/defaultAppender.c
+log4c/log4c.c
minfo.c
misc.c
pkg.c
@@ -82,6 +84,7 @@
pkgdir/yum/yum.c
pkgfetch.c
pkgfl.c
+pkgiter.c
pkgmark.c
pkgmisc.c
pkgroup.c
@@ -107,6 +110,8 @@
pm/rpm/rpminstall.c
pm/rpm/rpmvercmp.c
pm/rpm/signature.c
+pm/rpm/signature4.c
+pm/rpm/signature5.c
poldek_term.c
poldek_ts.c
sigint/sigint.c
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/Makefile.am?r1=1.98&r2=1.99&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/configure.in?r1=1.144&r2=1.145&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/poldek_ts.c?r1=1.72&r2=1.73&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/upgrade-dist.c?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/po/POTFILES.in?r1=1.34&r2=1.35&f=u
More information about the pld-cvs-commit
mailing list