143e491 Fix counting of updated repositories and the affected test cases. — HardenedBSD-pkg

modified src/update.c

@@ -77,7 +77,6 @@ pkgcli_update(bool force, bool strict, const char *reponame)

 		retcode = pkg_update(r, force);
 		if (retcode == EPKG_UPTODATE) {
 			update_count++;
 			retcode = EPKG_OK;
 			if (!quiet) {
 				printf("%s repository is up to date.\n",

@@ -87,6 +86,10 @@ pkgcli_update(bool force, bool strict, const char *reponame)

 		else if (retcode != EPKG_OK && strict)
 			retcode = EPKG_FATAL;
 		if (retcode == EPKG_OK) {
 			update_count++;
 		}
 		total_count ++;
 	}

modified tests/frontend/conflicts-multirepo.sh

@@ -154,6 +154,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local2 repository update completed. 2 packages processed.
 All repositories are up to date.
 Updating database digests format:  done
 Checking for upgrades (2 candidates):  done
 Processing candidates (2 candidates):  done

modified tests/frontend/conflicts.sh

@@ -72,6 +72,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local repository update completed. 1 packages processed.
 All repositories are up to date.
 Updating database digests format:  done
 Checking integrity... done (1 conflicting)
   - test2-1 conflicts with test-1 on ${TMPDIR}/a

modified tests/frontend/issue1425.sh

@@ -160,6 +160,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 4 package(s) will be affected (of 0 checked):

@@ -202,10 +203,10 @@ EOF

 OUTPUT_CASE2="Updating repoA repository catalogue...
 repoA repository is up-to-date.
 repoA repository is up to date.
 Updating repoB repository catalogue...
 repoB repository is up-to-date.
 All repositories are up-to-date.
 repoB repository is up to date.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 2 package(s) will be affected (of 0 checked):

@@ -231,10 +232,10 @@ ${JAILED}[2/2] Extracting pkgA-1.0: done

 OUTPUT_CASE3="Updating repoA repository catalogue...
 repoA repository is up-to-date.
 repoA repository is up to date.
 Updating repoB repository catalogue...
 repoB repository is up-to-date.
 All repositories are up-to-date.
 repoB repository is up to date.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 4 package(s) will be affected (of 0 checked):

modified tests/frontend/issue1440.sh

@@ -195,6 +195,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 4 package(s) will be affected (of 0 checked):

@@ -224,10 +225,10 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done

 OUTPUT_CASE2="Updating repoA repository catalogue...
 repoA repository is up-to-date.
 repoA repository is up to date.
 Updating repoB repository catalogue...
 repoB repository is up-to-date.
 All repositories are up-to-date.
 repoB repository is up to date.
 All repositories are up to date.
 Checking for upgrades (1 candidates):  done
 Processing candidates (1 candidates):  done
 Checking integrity... done (0 conflicting)

modified tests/frontend/php-pr.sh

@@ -243,6 +243,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local repository update completed. 4 packages processed.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 4 package(s) will be affected (of 0 checked):

@@ -269,8 +270,8 @@ Number of packages to be reinstalled: 1

 OUTPUT="Updating local repository catalogue...
 local repository is up-to-date.
 All repositories are up-to-date.
 local repository is up to date.
 All repositories are up to date.
 Checking for upgrades (3 candidates):  done
 Processing candidates (3 candidates):  done
 Checking integrity... done (0 conflicting)

modified tests/frontend/requires.sh

@@ -61,6 +61,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.
 All repositories are up to date.
 Checking integrity... done (0 conflicting)
 The following 2 package(s) will be affected (of 0 checked):

modified tests/frontend/rubypuppet.sh

@@ -329,6 +329,7 @@ ${JAILED}meta.txz : done

 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local repository update completed. 5 packages processed.
 All repositories are up to date.
 Checking for upgrades (4 candidates):  done
 Processing candidates (4 candidates):  done
 Checking integrity... done (1 conflicting)