poldek-pkgset.patch

   1 diff -u -r1.55.4.2 -r1.55.4.3
   2 --- pkgset.c    2004/02/26 18:22:28     1.55.4.2
   3 +++ pkgset.c    2004/06/06 20:47:51     1.55.4.3
   4 @@ -11,7 +11,7 @@
   5  */
   6
   7  /*
   8 -  $Id$
   9 +  $Id$
  10  */
  11
  12  #include <limits.h>
  13 @@ -665,10 +665,11 @@
  14      rpm_define("_tmppath", "/tmp");
  15      rpm_define("tmppath", "/tmp");
  16      rpm_define("tmpdir", "/tmp");
  17 -
  18 -    if (!mark_dependencies(ps, inst->flags))
  19 -        return 0;
  20
  21 +    if ((inst->flags & INSTS_FOLLOW)) {
  22 +        if (!mark_dependencies(ps, inst->flags))
  23 +            return 0;
  24 +    }
  25
  26      nerr = 0;
  27      ninstalled = 0;
  28 @@ -704,20 +705,18 @@
  29                  logn(LOGERR|LOGFILE, "INST-ERR %s", pkg->name);
  30                  nerr++;
  31              }
  32 -            printf("exit\n");
  33 -            exit(1);
  34              ninstalled++;
  35              ninstalled_bytes += pkg->size;
  36              inf.nfbytes -= pkg->fsize;
  37              printf_c(PRCOLOR_YELLOW,
  38                       _(" %d of %d (%.2f of %.2f MB) packages done"),
  39                       ninstalled, inf.npackages,
  40 -                     ninstalled_bytes/(1024*1000),
  41 -                     inf.nbytes/(1024*1000));
  42 +                     ninstalled_bytes/(1024*1000.0),
  43 +                     inf.nbytes/(1024*1000.0));
  44
  45              if (is_remote)
  46                  printf_c(PRCOLOR_YELLOW, _("; %.2f MB to download"),
  47 -                         inf.nfbytes/(1024*1000));
  48 +                         inf.nfbytes/(1024*1000.0));
  49              printf_c(PRCOLOR_YELLOW, "\n");
  50          }
  51      }