1 ===================================================================
2 RCS file: /cvsroot/installer/poldek/pkgset-install.c,v
3 retrieving revision 1.147
4 retrieving revision 1.148
5 diff -u -r1.147 -r1.148
6 --- installer/poldek/pkgset-install.c 2005/10/24 15:30:40 1.147
7 +++ installer/poldek/pkgset-install.c 2005/11/01 19:36:36 1.148
10 memset(&successor, 0, sizeof(successor));
11 if (process_as == PROCESS_AS_ORPHAN &&
12 upg->ts->getop(upg->ts, POLDEK_OP_AGGREEDY)) {
13 - if (pkg_drags(pkg, ps, upg) == 0) {
14 + int ndrags = pkg_drags(pkg, ps, upg);
15 + DBGF("%s, ndrags %d\n", pkg_id(pkg), ndrags);
16 + if (ndrags == 0 || 1) { /* XXX cond temporary disabled - needs test */
18 int is_marked = 0, ndragged = 0, by_obsoletes = 0;
20 @@ -1186,9 +1188,10 @@
21 successor.realpkg = p;
22 successor.by_obsoletes = by_obsoletes;
24 - /* do not follow successor if package drags something and
26 - if (p && (ndragged = pkg_drags(p, ps, upg)) > 0 && is_marked == 0) {
27 + /* do not follow successor if it drags more packages than orphaned one
28 + * and successor is not marked */
30 + if (p && (ndragged = pkg_drags(p, ps, upg)) > ndrags && is_marked == 0) {
31 DBGF("OMIT select_successor %s -> %s (%d)\n",
32 pkg_id(pkg), pkg_id(p), ndragged);
34 ===================================================================
35 RCS file: /cvsroot/installer/poldek/vfile/misc.c,v
36 retrieving revision 1.11
37 retrieving revision 1.12
39 --- installer/poldek/vfile/misc.c 2005/07/17 15:04:34 1.11
40 +++ installer/poldek/vfile/misc.c 2005/11/02 19:45:40 1.12
63 if (!isalnum(*p) && strchr("-+/._@!~", *p) == NULL) {
64 vf_logerr("%s:%c non alphanumeric characters not allowed\n",
65 ===================================================================
66 RCS file: /cvsroot/installer/poldek/vfile/extcompr.c,v
67 retrieving revision 1.7
68 retrieving revision 1.8
70 --- installer/poldek/vfile/extcompr.c 2005/05/15 15:46:59 1.7
71 +++ installer/poldek/vfile/extcompr.c 2005/11/02 20:10:36 1.8
77 + if (*vfile_verbose > 0)
78 vf_loginfo(_("Decompressing %s...\n"), n_basenam(path));
79 return vf_do_compr(uncompr, "-d", path, destpath);
81 ===================================================================
82 RCS file: /cvsroot/installer/poldek/cli/uninstall.c,v
83 retrieving revision 1.25
84 retrieving revision 1.26
86 --- installer/poldek/cli/uninstall.c 2005/07/12 17:29:09 1.25
87 +++ installer/poldek/cli/uninstall.c 2005/11/05 00:14:38 1.26
90 ts->setop(ts, POLDEK_OP_GREEDY, bool);
95 if (ts->getop(ts, POLDEK_OP_TEST))
96 ===================================================================
97 RCS file: /cvsroot/installer/poldek/vfcompr,v
98 retrieving revision 1.4
99 retrieving revision 1.6
101 --- installer/poldek/vfcompr 2004/07/05 19:15:10 1.4
102 +++ installer/poldek/vfcompr 2005/11/02 20:25:37 1.6
107 - md5file="${src}-vfcompr.md5"
108 + md5file="${dest}-vfcompr.md5"
110 if [ -f $dest -a -f "$md5file" ]; then
111 #echo md5sum --check "$md5file"