Remove extras in more locations

2 files changed, 2 insertions, 9 deletions

diff --git a/src/lib/delivery/delivery.c b/src/lib/delivery/delivery.c
index 7ae2b01..499b680 100644
--- a/src/lib/delivery/delivery.c
+++ b/src/lib/delivery/delivery.c
@@ -210,15 +210,7 @@ void delivery_defer_packages(struct Delivery *ctx, int type) {
         } else {
             strncpy(package_name, name, sizeof(package_name) - 1);
         }
-
-        char *extra_begin = strchr(package_name, '[');
-        char *extra_end = NULL;
-        if (extra_begin) {
-            extra_end = strchr(extra_begin, ']');
-            if (extra_end) {
-                *extra_begin = '\0';
-            }
-        }
+        remove_extras(package_name);
 
         msg(STASIS_MSG_L3, "package '%s': ", package_name);
 
diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c
index cf6ccaa..6432bef 100644
--- a/src/lib/delivery/delivery_install.c
+++ b/src/lib/delivery/delivery_install.c
@@ -35,6 +35,7 @@ static char *have_spec_in_config(const struct Delivery *ctx, const char *name) {
         } else {
             strncpy(package, config_spec, sizeof(package) - 1);
         }
+        remove_extras(package);
         if (strncmp(package, name, strlen(package)) == 0) {
             return config_spec;
         }