[BACK]Return to perform.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / pkgtools / pkg_install / files / add

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/pkgtools/pkg_install/files/add/perform.c between version 1.33 and 1.34

version 1.33, 2005/07/25 13:13:00 version 1.34, 2005/11/05 13:20:09
Line 191  installprereq(const char *name, int *err
Line 191  installprereq(const char *name, int *err
                             Viewbase ? "-W" : "", Viewbase ? Viewbase : "",                              Viewbase ? "-W" : "", Viewbase ? Viewbase : "",
                             Force ? "-f" : "",                              Force ? "-f" : "",
                             Prefix ? "-p" : "", Prefix ? Prefix : "",                              Prefix ? "-p" : "", Prefix ? Prefix : "",
                             Verbose ? "-v" : "", name, NULL)) {                              Verbose ? "-v" : "",
                               "-A", name, NULL)) {
                 warnx("autoload of dependency `%s' failed%s",                  warnx("autoload of dependency `%s' failed%s",
                         name, Force ? " (proceeding anyway)" : "!");                          name, Force ? " (proceeding anyway)" : "!");
                 if (!Force)                  if (!Force)
Line 346  pkg_do(const char *pkg, lpkg_head_t *pkg
Line 347  pkg_do(const char *pkg, lpkg_head_t *pkg
                          * take up once it's unpacked.  I've noticed that most packages                           * take up once it's unpacked.  I've noticed that most packages
                          * compress an average of 75%, so multiply by 4 for good measure.                           * compress an average of 75%, so multiply by 4 for good measure.
                          */                           */
   
                         needed = 4 * (uint64_t) sb.st_size;                          needed = 4 * (uint64_t) sb.st_size;
                         if (!inPlace && min_free(playpen) < needed) {                          if (!inPlace && min_free(playpen) < needed) {
                                 warnx("projected size of %" PRIu64 " bytes exceeds available free space\n"                                  warnx("projected size of %" PRIu64 " bytes exceeds available free space\n"
Line 497  pkg_do(const char *pkg, lpkg_head_t *pkg
Line 499  pkg_do(const char *pkg, lpkg_head_t *pkg
   
         /* See if this package (exact version) is already registered */          /* See if this package (exact version) is already registered */
         if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) {          if ((isdir(LogDir) || islinktodir(LogDir)) && !Force) {
                 warnx("package `%s' already recorded as installed", PkgName);                  if (!Automatic && is_automatic_installed(LogDir)) {
                           mark_as_automatic_installed(LogDir, 0);
                           warnx("package `%s' was already installed as "
                                 "dependency, now marked as installed manually",
                                 PkgName);
                   } else {
                           warnx("package `%s' already recorded as installed",
                                 PkgName);
                   }
                 goto success;   /* close enough for government work */                  goto success;   /* close enough for government work */
         }          }
   
Line 941  ignore_replace_depends_check:
Line 951  ignore_replace_depends_check:
                                         warnx("cannot properly close file %s", contents);                                          warnx("cannot properly close file %s", contents);
                         }                          }
                 }                  }
                   if (Automatic)
                           mark_as_automatic_installed(LogDir, 1);
                 if (Verbose)                  if (Verbose)
                         printf("Package %s registered in %s\n", PkgName, LogDir);                          printf("Package %s registered in %s\n", PkgName, LogDir);
         }          }
Line 1064  pkg_perform(lpkg_head_t *pkgs)
Line 1076  pkg_perform(lpkg_head_t *pkgs)
   
         return err_cnt;          return err_cnt;
 }  }
   

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

CVSweb <webmaster@jp.NetBSD.org>