openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File volid_fix.diff of Package kiwi (Revision 2cad418cff3ba985de4ff24bbf7ba52b)

Currently displaying revision 2cad418cff3ba985de4ff24bbf7ba52b , Show latest

commit 0409385355b9c7d8306265b44eb9cab5093ca0c9
Author: Adrian Schröter <adrian@suse.de>
Date:   Thu Jul 1 11:30:53 2010 +0200

Make volume id labels nicer on coolos request:
    * Always strip -Media
    * Do not add dots when stripping
    * Do add media number .XXX suffix only when multiple medias exist

diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm
index 235f606..98d9f0a 100644
--- a/modules/KIWICollect.pm
+++ b/modules/KIWICollect.pm
@@ -617,9 +617,12 @@ sub mainTask
       # construct volume id, no longer than 32 bytes allowed
       my $volid_maxlen = 32;
       my $vname = $name;
-      $vname =~ s/-Media/\./ if length($vname) > ($volid_maxlen - 4);
-      $vname =~ s/-Build/\./ if length($vname) > ($volid_maxlen - 4);
-      my $vid = sprintf( "%s.%03d", substr($vname,0,($volid_maxlen - 4)), $cd );
+      $vname =~ s/-Media//;
+      $vname =~ s/-Build// if length($vname) > ($volid_maxlen - 4);
+      my $vid = substr($vname,0,($volid_maxlen));
+      if $this->{m_proddata}->getVar("MULTIPLE_MEDIA", "yes") eq "yes") {
+         $vid = sprintf( "%s.%03d", substr($vname,0,($volid_maxlen - 4)), $cd );
+      };
 
       my $attr = "-r"; # RockRidge
       $attr .= " -pad"; # pad image by 150 sectors - needed for Linux

Places

File volid_fix.diff of Package kiwi (Revision 2cad418cff3ba985de4ff24bbf7ba52b)

Places