install/upgrade: print REMOVED at the end

fixes: freebsd#2252
kfv · Jul 1, 2024 · 9e8783c · 9e8783c
1 parent 9ec9d01
commit 9e8783c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/utils.c b/src/utils.c
@@ -710,11 +710,11 @@ print_info(struct pkg * const pkg, uint64_t options)
 
 enum pkg_display_type {
 	PKG_DISPLAY_LOCKED = 0,
-	PKG_DISPLAY_DELETE,
 	PKG_DISPLAY_INSTALL,
 	PKG_DISPLAY_UPGRADE,
 	PKG_DISPLAY_DOWNGRADE,
 	PKG_DISPLAY_REINSTALL,
+	PKG_DISPLAY_DELETE,
 	PKG_DISPLAY_FETCH,
 	PKG_DISPLAY_GROUP_INSTALL,
 	PKG_DISPLAY_GROUP_UPGRADE,

diff --git a/tests/frontend/conflicts.sh b/tests/frontend/conflicts.sh
@@ -138,15 +138,15 @@ Cannot solve problem using SAT solver, trying another plan
 Checking integrity... done (0 conflicting)
 The following 3 package(s) will be affected (of 0 checked):
 
-Installed packages to be REMOVED:
-	bar: 1.0
-
 New packages to be INSTALLED:
 	bar1: 1.1
 
 Installed packages to be UPGRADED:
 	foo: 1.0 -> 1.0_1
 
+Installed packages to be REMOVED:
+	bar: 1.0
+
 Number of packages to be removed: 1
 Number of packages to be installed: 1
 Number of packages to be upgraded: 1
@@ -317,16 +317,16 @@ Cannot solve problem using SAT solver, trying another plan
 Checking integrity... done (0 conflicting)
 The following 4 package(s) will be affected (of 0 checked):
 
-Installed packages to be REMOVED:
-	bar: 1.0
-	other: 1.0
-
 New packages to be INSTALLED:
 	bar1: 1.1
 
 Installed packages to be UPGRADED:
 	foo: 1.0 -> 1.0_1
 
+Installed packages to be REMOVED:
+	bar: 1.0
+	other: 1.0
+
 Number of packages to be removed: 2
 Number of packages to be installed: 1
 Number of packages to be upgraded: 1
@@ -444,12 +444,12 @@ Checking integrity... done (1 conflicting)
 Checking integrity... done (0 conflicting)
 The following 2 package(s) will be affected (of 0 checked):
 
-Installed packages to be REMOVED:
-	test: 1
-
 New packages to be INSTALLED:
 	test2: 1
 
+Installed packages to be REMOVED:
+	test: 1
+
 Number of packages to be removed: 1
 Number of packages to be installed: 1
 ${JAILED}[1/2] Deinstalling test-1...

diff --git a/tests/frontend/rubypuppet.sh b/tests/frontend/rubypuppet.sh
@@ -239,9 +239,6 @@ Checking integrity... done (1 conflicting)
 Checking integrity... done (0 conflicting)
 The following 6 package(s) will be affected (of 0 checked):
 
-Installed packages to be REMOVED:
-	ruby20-gems: 1.0
-
 New packages to be INSTALLED:
 	ruby21-gems: 1.0
 
@@ -253,6 +250,9 @@ Installed packages to be REINSTALLED:
 	rubygem-hiera-1.0 (direct dependency changed: ruby)
 	rubygem-ruby-augeas-1.0 (direct dependency changed: ruby)
 
+Installed packages to be REMOVED:
+	ruby20-gems: 1.0
+
 Number of packages to be removed: 1
 Number of packages to be installed: 1
 Number of packages to be upgraded: 1