SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

portablectl: fix using --force when no --extension is passed

Browse Source 
The 'force' flag applies whether or not extensions are present
This commit is contained in:
Luca Boccassi
2023-06-16 12:31:56 +01:00
parent e0a067a251
commit c18f4eb9e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/portable/portablectl.c
+4 -4
View File
@@ -264,7 +264,7 @@ static int get_image_metadata(sd_bus *bus, const char *image, char **matches, sd
assert(bus); assert(bus);
assert(reply); assert(reply);
method = strv_isempty(arg_extension_images) ? "GetImageMetadata" : "GetImageMetadataWithExtensions"; method = strv_isempty(arg_extension_images) && !arg_force ? "GetImageMetadata" : "GetImageMetadataWithExtensions";
r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method); r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method);
if (r < 0) if (r < 0)
@@ -907,11 +907,11 @@ static int attach_reattach_image(int argc, char *argv[], const char *method) {
} }
static int attach_image(int argc, char *argv[], void *userdata) { static int attach_image(int argc, char *argv[], void *userdata) {
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) ? "AttachImage" : "AttachImageWithExtensions"); return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) && !arg_force ? "AttachImage" : "AttachImageWithExtensions");
} }
static int reattach_image(int argc, char *argv[], void *userdata) { static int reattach_image(int argc, char *argv[], void *userdata) {
return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) ? "ReattachImage" : "ReattachImageWithExtensions"); return attach_reattach_image(argc, argv, strv_isempty(arg_extension_images) && !arg_force ? "ReattachImage" : "ReattachImageWithExtensions");
} }
static int detach_image(int argc, char *argv[], void *userdata) { static int detach_image(int argc, char *argv[], void *userdata) {
@@ -934,7 +934,7 @@ static int detach_image(int argc, char *argv[], void *userdata) {
(void) maybe_stop_disable(bus, image, argv); (void) maybe_stop_disable(bus, image, argv);
method = strv_isempty(arg_extension_images) ? "DetachImage" : "DetachImageWithExtensions"; method = strv_isempty(arg_extension_images) && !arg_force ? "DetachImage" : "DetachImageWithExtensions";
r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method); r = bus_message_new_method_call(bus, &m, bus_portable_mgr, method);
if (r < 0) if (r < 0)