[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files In the "quick depends pre-s...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbade84ffffe
branches:  trunk
changeset: 465641:cbade84ffffe
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Sun Jan 04 01:49:38 2004 +0000

description:
In the "quick depends pre-scan", first print all bad matching depends,
then exit (instead printing one conflicting pkg/version on each run).

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  18 +++++++++++-------
 pkgtools/pkg_install/files/lib/version.h |   4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 3d50141ab1a8 -r cbade84ffffe pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Sat Jan 03 23:51:08 2004 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Sun Jan 04 01:49:38 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.13 2003/12/20 04:23:05 grant Exp $       */
+/*     $NetBSD: perform.c,v 1.14 2004/01/04 01:49:38 hubertf Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.13 2003/12/20 04:23:05 grant Exp $");
+__RCSID("$NetBSD: perform.c,v 1.14 2004/01/04 01:49:38 hubertf Exp $");
 #endif
 #endif
 
@@ -128,7 +128,7 @@
        char   dbdir[FILENAME_MAX];
        const char *exact, *extra1;
        FILE   *cfile;
-       int     errc;
+       int     errc, err_prescan;
        plist_t *p;
        struct stat sb;
        struct utsname host_uname;
@@ -544,6 +544,7 @@
        /* Quick pre-check if any conflicting dependencies are installed
         * (e.g. version X is installed, but version Y is required)
         */
+       err_prescan=0;
        for (p = Plist.head; p; p = p->next) {
                char installed[FILENAME_MAX];
                
@@ -596,15 +597,18 @@
 
                                        if (Force) {
                                                warnx("Proceeding anyway.");
-                                       } else {        
-                                               warnx("Please resolve this conflict!");
-                                               errc = 1;
-                                               goto success; /* close enough */
+                                       } else {
+                                               err_prescan++;
                                        }
                                }
                        }
                }
        }
+       if (err_prescan > 0) {
+               warnx("Please resolve this conflict!");
+               errc += err_prescan;
+               goto success; /* close enough */
+       }       
        
 
        /* Now check the packing list for dependencies */
diff -r 3d50141ab1a8 -r cbade84ffffe pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sat Jan 03 23:51:08 2004 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sun Jan 04 01:49:38 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.19 2003/12/20 04:23:05 grant Exp $       */
+/*     $NetBSD: version.h,v 1.20 2004/01/04 01:49:38 hubertf Exp $     */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20031220"
+#define PKGTOOLS_VERSION "20040104"
 
 #endif /* _INST_LIB_VERSION_H_ */