s for formatting parallel slot, and S for raw slot

4 files changed, 8 insertions, 4 deletions

diff --git a/src/clients/cave/cmd_print_dependent_ids.cc b/src/clients/cave/cmd_print_dependent_ids.cc
index 2ab56f249..441ea0114 100644
--- a/src/clients/cave/cmd_print_dependent_ids.cc
+++ b/src/clients/cave/cmd_print_dependent_ids.cc
@@ -81,7 +81,8 @@ namespace
         PrintDependentIDsCommandLine() :
             g_display_options(main_options_section(), "Display Options", "Controls the output format."),
             a_format(&g_display_options, "format", 'f', "Select the output format. Special tokens recognised are "
-                    "%c for category, %p for package, %v for version, %s for slot, %: for ':' if we have a slot and "
+                    "%c for category, %p for package, %v for version, %s for slot, %S for slot in its native format, "
+                    "%: for ':' if we have a slot and "
                     "empty otherwise, %r for repository, %F for the canonical full form, %V for the canonical full "
                     "version, %W for the canonical full unversioned form, %N for the canonical full unnamed form, "
                     "%u for a uniquely identifying dependency spec, "
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index 3b4b17913..9f682aee7 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -108,7 +108,8 @@ namespace
                    ),
             g_display_options(main_options_section(), "Display Options", "Controls the output format."),
             a_format(&g_display_options, "format", 'f', "Select the output format. Special tokens recognised are "
-                    "%c for category, %p for package, %v for version, %s for slot, %: for ':' if we have a slot and "
+                    "%c for category, %p for package, %v for version, %s for slot, %S for slot in its native format, "
+                    "%: for ':' if we have a slot and "
                     "empty otherwise, %r for repository, %F for the canonical full form, %V for the canonical full "
                     "version, %W for the canonical full unversioned form, %N for the canonical full unnamed form, "
                     "%u for a uniquely identifying dependency spec, "
diff --git a/src/clients/cave/cmd_print_owners.cc b/src/clients/cave/cmd_print_owners.cc
index d5ed643a2..c9f5603a7 100644
--- a/src/clients/cave/cmd_print_owners.cc
+++ b/src/clients/cave/cmd_print_owners.cc
@@ -82,7 +82,8 @@ namespace
                     args::StringSetArg::StringSetArgOptions()),
             g_display_options(main_options_section(), "Display Options", "Controls the output format."),
             a_format(&g_display_options, "format", 'f', "Select the output format. Special tokens recognised are "
-                    "%c for category, %p for package, %v for version, %s for slot, %: for ':' if we have a slot and "
+                    "%c for category, %p for package, %v for version, %s for slot, %s for slot in its native format, "
+                    "%: for ':' if we have a slot and "
                     "empty otherwise, %r for repository, %F for the canonical full form, %V for the canonical full "
                     "version, %W for the canonical full unversioned form, %N for the canonical full unnamed form, "
                     "%u for a uniquely identifying dependency spec, "
diff --git a/src/clients/cave/format_package_id.cc b/src/clients/cave/format_package_id.cc
index d48288b6b..3e12359ee 100644
--- a/src/clients/cave/format_package_id.cc
+++ b/src/clients/cave/format_package_id.cc
@@ -45,7 +45,8 @@ paludis::cave::format_package_id(
     m->insert('c', stringify(id->name().category()));
     m->insert('p', stringify(id->name().package()));
     m->insert('v', stringify(id->version()));
-    m->insert('s', id->slot_key() ? stringify(id->slot_key()->parse_value().raw_value()) : "");
+    m->insert('s', id->slot_key() ? stringify(id->slot_key()->parse_value().parallel_value()) : "");
+    m->insert('S', id->slot_key() ? stringify(id->slot_key()->parse_value().raw_value()) : "");
     m->insert(':', id->slot_key() ? ":" : "");
     m->insert('r', stringify(id->repository_name()));
     m->insert('F', id->canonical_form(idcf_full));