Redo pkg-status output

1 files changed, 81 insertions, 81 deletions

diff --git a/tests/pkg-system.test b/tests/pkg-system.test
index 1344cbf..271921c 100644
--- a/tests/pkg-system.test
+++ b/tests/pkg-system.test
@@ -114,8 +114,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/*.
     #
     $pkg_build 'sys:libbar' 2>'configured sys:libbar/*';
-    $pkg_status libbar      1>'configured,system * hold_package hold_version; available 2 1 sys:?';
-    $pkg_status libbaz      1>'available 2 sys:?';
+    $pkg_status libbar      1>'!libbar configured,system !* available 2 1';
+    $pkg_status libbaz      1>'libbaz available 2';
 
     # Build foo with preconfigured sys:libbar/*.
     #
@@ -128,9 +128,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system * hold_package hold_version; available 2 1 sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !* available 2 1';
+    $pkg_status libbaz >'libbaz available 2';
 
     # Reconfigure sys:libbar/* to 2.
     #
@@ -143,9 +143,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     # Reconfigure sys:libbar/2 to libbar/2.
     #
@@ -167,9 +167,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured !2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     $pkg_drop foo libbar
   }
@@ -191,9 +191,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -215,9 +215,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -244,8 +244,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated libbar/2
       EOE
 
-    $pkg_status libbar >'configured 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status libbar >'!libbar configured !2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     # Build foo and sys:libbar/2.
     #
@@ -263,9 +263,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -292,8 +292,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated libbar/2
       EOE
 
-    $pkg_status libbar >'configured 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status libbar >'!libbar configured !2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     # Build foo and sys:libbar.
     #
@@ -311,9 +311,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system * hold_package hold_version; available 2 1 sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !* available 2 1';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -329,7 +329,7 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/2.
     #
     $pkg_build 'sys:libbar/2' 2>'configured sys:libbar/2';
-    $pkg_status libbar       >'configured,system 2 hold_package hold_version; available sys:?';
+    $pkg_status libbar         >'!libbar configured,system !2';
 
     # Build foo and libbar/2.
     #
@@ -353,9 +353,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured !2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     # Build sys:libbar/2.
     #
@@ -371,9 +371,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     # Build libbar/2.
     #
@@ -395,9 +395,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured !2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     $pkg_drop foo libbar
   }
@@ -413,8 +413,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/1.
     #
     $pkg_build 'sys:libbar/1' 2>'configured sys:libbar/1';
-    $pkg_status libbar        1>'configured,system 1 hold_package hold_version; available 2 sys:?';
-    $pkg_status libbaz        1>'available 2 sys:?';
+    $pkg_status libbar        1>'!libbar configured,system !1 available 2';
+    $pkg_status libbaz        1>'libbaz available 2';
 
     # Fail to build foo.
     #
@@ -447,9 +447,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured 2 hold_package; available sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured 2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     $pkg_drop foo libbar
   }
@@ -471,9 +471,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system *; available 2 1 sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'libbar configured,system * available 2 1';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -501,8 +501,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated libbar/1
       EOE
 
-    $pkg_status libbar >'configured 1 hold_package hold_version; available 2 sys:?';
-    $pkg_status libbaz >'configured 2; available sys:?';
+    $pkg_status libbar >'!libbar configured !1 available 2';
+    $pkg_status libbaz >'libbaz configured 2';
 
     # Fail to build foo.
     #
@@ -529,9 +529,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     # Build foo and sys:libbar/2.
     #
@@ -540,9 +540,9 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
-    $pkg_status libbaz >'available 2 sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
+    $pkg_status libbaz >'libbaz available 2';
 
     $pkg_drop foo libbar
   }
@@ -572,8 +572,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
         info: specify sys:libbar if it is available from the system
       EOE
 
-    $pkg_status foo    >'available 2 sys:?';
-    $pkg_status libbar >'available sys:?'
+    $pkg_status foo    >'foo available 2';
+    $pkg_status libbar >'libbar unknown'
   }
 
   : foo-syslibbar
@@ -593,8 +593,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system * hold_package hold_version; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !*';
 
     $pkg_drop foo libbar
   }
@@ -610,7 +610,7 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/1.
     #
     $pkg_build 'sys:libbar/1' 2>'configured sys:libbar/1';
-    $pkg_status libbar        1>'configured,system 1 hold_package hold_version; available sys:?';
+    $pkg_status libbar        1>'!libbar configured,system !1';
 
     # Fail to build foo.
     #
@@ -633,8 +633,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
 
     $pkg_drop foo libbar
   }
@@ -658,7 +658,7 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/2.
     #
     $pkg_build 'sys:libbar/2' 2>'configured sys:libbar/2';
-    $pkg_status libbar        1>'configured,system 2 hold_package hold_version; available sys:?';
+    $pkg_status libbar        1>'!libbar configured,system !2';
 
     # Still fail to build foo and sys:libbar/1.
     #
@@ -686,7 +686,7 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/2.
     #
     $pkg_build 'sys:libbar/1' 2>'configured sys:libbar/1';
-    $pkg_status libbar        1>'configured,system 1 hold_package hold_version; available sys:?';
+    $pkg_status libbar        1>'!libbar configured,system !1';
 
     # Fail to build sys:libbar/1.1 and foo.
     #
@@ -719,8 +719,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system *; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'libbar configured,system *';
 
     # Drop foo.
     #
@@ -730,8 +730,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       purged foo
       EOE
 
-    $pkg_status foo    >'available 2 sys:?';
-    $pkg_status libbar >'available sys:?'
+    $pkg_status foo    >'foo available 2';
+    $pkg_status libbar --system >'libbar available sys:?'
   }
 
   : syslibbar1-foo-syslibbar-drop-foo
@@ -745,7 +745,7 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
     # Build sys:libbar/1.
     #
     $pkg_build 'sys:libbar/1' 2>'configured sys:libbar/1';
-    $pkg_status libbar        1>'configured,system 1 hold_package hold_version; available sys:?';
+    $pkg_status libbar        1>'!libbar configured,system !1';
 
     # Fail to build foo.
     #
@@ -768,8 +768,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'!libbar configured,system !2';
 
     # Drop foo.
     #
@@ -778,8 +778,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       purged foo
       EOE
 
-    $pkg_status foo    >'available 2 sys:?';
-    $pkg_status libbar >'configured,system 2 hold_package hold_version; available sys:?'
+    $pkg_status foo    >'foo available 2';
+    $pkg_status libbar >'!libbar configured,system !2'
   }
 }
 
@@ -816,8 +816,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       info: while satisfying foo/2
       EOE
 
-    $pkg_status foo    >'available 2 sys:?';
-    $pkg_status libbar >'unknown'
+    $pkg_status foo    >'foo available 2';
+    $pkg_status libbar >'libbar unknown'
   }
 
   : syslibbar1-foo-syslibbar-drop-foo
@@ -841,16 +841,16 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'libbar configured,system 2';
 
     # Fail as libbar while being selected is still unknown (not present in t3
     # repo).
     #
     $pkg_build 'sys:libbar'     2>'error: unknown package libbar' != 0;
     $pkg_build foo 'sys:libbar' 2>'error: unknown package libbar' != 0;
-    $pkg_status foo             1>'configured 2 hold_package; available sys:?';
-    $pkg_status libbar          1>'configured,system 2';
+    $pkg_status foo             1>'!foo configured 2';
+    $pkg_status libbar          1>'libbar configured,system 2';
 
     # Build foo and ?sys:libbar/3. Note that libbar stays as system version 2.
     #
@@ -859,8 +859,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'libbar configured,system 2';
 
     # Build foo and ?sys:libbar.
     #
@@ -869,8 +869,8 @@ rep_fetch  += -d cfg --auth all --trust-yes 2>!
       updated foo/2
       EOE
 
-    $pkg_status foo    >'configured 2 hold_package; available sys:?';
-    $pkg_status libbar >'configured,system 2';
+    $pkg_status foo    >'!foo configured 2';
+    $pkg_status libbar >'libbar configured,system 2';
 
     $pkg_drop foo
   }