[Midnightbsd-cvs] src [12290] stable/1.2/usr.sbin/mport/mport.c: remove some of the debug logging.

[laffer1 at midnightbsd.org]

Revision: 12290
          http://svnweb.midnightbsd.org/src/?rev=12290
Author:   laffer1
Date:     2019-11-13 01:03:52 -0500 (Wed, 13 Nov 2019)
Log Message:
-----------
remove some of the debug logging. add an os check for now to work around old versions that won't upgrade

Modified Paths:
--------------
    stable/1.2/usr.sbin/mport/mport.c

Modified: stable/1.2/usr.sbin/mport/mport.c
===================================================================
--- stable/1.2/usr.sbin/mport/mport.c	2019-11-13 06:01:17 UTC (rev 12289)
+++ stable/1.2/usr.sbin/mport/mport.c	2019-11-13 06:03:52 UTC (rev 12290)
@@ -36,6 +36,7 @@
 #include <err.h>
 #include <dispatch/dispatch.h>
 #include <mport.h>
+#include <mport_private.h>
 
 #define MPORT_TOOLS_PATH "/usr/libexec/"
 #define MPORT_LOCAL_PKG_PATH "/var/db/mport/downloads"
@@ -779,7 +780,9 @@
 
 	if (indexEntries != NULL) {
 		while (*indexEntries != NULL) {
-			if ((*indexEntries)->version != NULL && mport_version_cmp(pack->version, (*indexEntries)->version) < 0) {
+			int osflag = mport_check_preconditions(mport, pack, MPORT_PRECHECK_OS); 
+			if ((*indexEntries)->version != NULL && (mport_version_cmp(pack->version, (*indexEntries)->version) < 0 || 
+			    (mport_version_cmp(pack->version, (*indexEntries)->version) == 0 && osflag == MPORT_OK))) {
 				ret = 1;
 				break;
 			}
@@ -796,8 +799,6 @@
 	mportPackageMeta **depends;
 	int ret = 0;
 
-	fprintf(stderr, "Entering %s\n", pack->name);
-
 	if (mport_pkgmeta_get_downdepends(mport, pack, &depends) == MPORT_OK) {
 		if (depends == NULL) {
 			if (indexCheck(mport, pack)) {
@@ -822,7 +823,6 @@
 				depends++;
 			}
 			if (indexCheck(mport, pack)) {
-				fprintf(stderr, "Updating port called %s\n", pack->name);
 				if (update(mport, pack->name) != 0) {
 					fprintf(stderr, "Error updating %s\n", pack->name);
 				} else