poldek-depfix-pkgdrags.patch

   1 --- /var/home/mis/rpm/BUILD/poldek-0.18.7/pkgset-install.c      2004-12-28 12:29:19.885741480 +0100
   2 +++ pkgset-install.c    2004-12-28 12:30:52.456668560 +0100
   3 @@ -11,7 +11,7 @@
   4  */
   5
   6  /*
   7 -  $Id$
   8 +  $Id$
   9  */
  10
  11  #ifdef HAVE_CONFIG_H
  12 @@ -752,14 +752,14 @@
  13      if (db_dep->flags & PROCESS_AS_NEW) {
  14          int i, n;
  15          char errmsg[4096];
  16 -        n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by "),
  17 +        n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by"),
  18                       capreq_snprintf_s(req));
  19
  20          for (i=0; i < n_array_size(db_dep->pkgs); i++) {
  21              struct pkg *p = n_array_nth(db_dep->pkgs, i);
  22
  23              snprintf(&errmsg[n], sizeof(errmsg) - n, "%s%s",
  24 -                     pkg_is_installed(p) ? "" : _("already marked "),
  25 +                     pkg_is_installed(p) ? "" : _(" already marked "),
  26                       pkg_snprintf_s(p));
  27
  28              logn(LOGERR, "%s", errmsg);
  29 @@ -875,7 +875,7 @@
  30              }
  31          }
  32
  33 -        if (pkg->fl && dbpkg->pkg->fl) {
  34 +        if (dbpkg->pkg->fl) {
  35              struct capreq *cap;
  36              int j, k;
  37
  38 @@ -967,7 +967,9 @@
  39          /* cached */
  40          if (db_deps_provides(upg->db_deps, req, DBDEP_DBSATISFIED)) {
  41              DBGF("%s: satisfied by db [cached]\n", capreq_snprintf_s(req));
  42 -
  43 +
  44 +        } else if (tomark && marked_for_removal(tomark, upg)) {
  45 +            DBGF_F("%s: marked for removal\n", pkg_snprintf_s(tomark));
  46
  47          } else if (pkgdb_match_req(upg->inst->db, req, 1,
  48                                     upg->uninst_set->dbpkgs)) {
  49 @@ -976,9 +978,10 @@
  50                   upg->strict);
  51
  52              //dbpkg_set_dump(upg->uninst_set);
  53 -            if ((pkg->flags & PKG_DBPKG) == 0)
  54 -                db_deps_add(upg->db_deps, true_req, pkg, tomark,
  55 -                            PROCESS_AS_NEW | DBDEP_DBSATISFIED);
  56 +            // commented out - pkg_drags() should not touch upg context
  57 +            //if ((pkg->flags & PKG_DBPKG) == 0)
  58 +            //    db_deps_add(upg->db_deps, true_req, pkg, tomark,
  59 +            //                PROCESS_AS_NEW | DBDEP_DBSATISFIED);
  60
  61          } else if (tomark || tomark == NULL) { /* don't care found or not */
  62              ntoinstall++;
  63 @@ -1144,7 +1147,7 @@
  64              if (marked_for_removal_by_req(real_tomark, req, upg)) {
  65                  logn(LOGERR, _("%s (cap %s) is required by %s%s"),
  66                       pkg_snprintf_s(real_tomark), capreq_snprintf_s(req),
  67 -                     pkg_is_installed(pkg) ? "" : _("already marked "),
  68 +                     pkg_is_installed(pkg) ? "" : " already marked",
  69                       pkg_snprintf_s0(pkg));
  70                  upg->nerr_dep++;
  71