Merge pull request #8807 from mlschroe/master

[backend] vagrand box publishing: cope with profiles that contain a h…
openSUSE · Nov 28, 2019 · cf4b816 · cf4b816
2 parents 0937f42 + 6c15156
commit cf4b816
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -1132,9 +1132,9 @@ sub createrepo_vagrant {
     if (!$withversion) {
       # split off profile
       my $profile = '';
-      $profile = $1 if $xbox =~ s/(-[^0-9-][^-]*)$//;
+      $profile = $1 if $xbox =~ s/((?:-[^0-9-][^-]*)+)$//;
       # split off version
-      next unless $xbox =~ s/-([^-]*)$//;
+      next unless $xbox =~ s/-([0-9][^-]*)$//;
       my $version = $1;
       $profile = '' if $profile eq "-$provider";
       # add to boxes (last one wins)