@@ -361,9 +361,9 @@ def doFlavor(self, node):
361361 self .isos .append (iso )
362362 if node .attrib .get ("ln_iso_to_repo" , "" ):
363363 self .ln_iso_to_repo [iso ] = node .attrib ["ln_iso_to_repo" ]
364-
365- if node .attrib . get ( "name" , "" ) and node . attrib . get ( "folder" , " " ):
366- self .iso_folder [node . attrib [ "name" ] ] = node .attrib ["folder" ]
364+ elif node . attrib . get ( "name" , "" ) and node . attrib . get ( "folder" , "" ):
365+ for iso in node .attrib [ "name" ]. split ( "| " ):
366+ self .iso_folder [iso ] = node .attrib ["folder" ]
367367
368368 for t in node .findall (".//isos/*" ):
369369 self .isos .append (t .tag )
@@ -559,15 +559,15 @@ def gen_read_files(self, f):
559559 self .p (cfg .read_files_isos , f )
560560 else :
561561 for iso in self .isos :
562- folder = self .folder
563- if self . iso_folder :
564- folder = self . iso_folder . get ( iso , "" )
562+ folder = self .iso_folder . get ( iso , "" )
563+ if folder :
564+ folder = folder + "/"
565565
566566 if "*" in iso :
567567 self .p (
568568 cfg .read_files_iso ,
569569 f ,
570- "FOLDER" ,
570+ "FOLDER/ " ,
571571 folder ,
572572 "SRCISO" ,
573573 "" ,
@@ -577,12 +577,12 @@ def gen_read_files(self, f):
577577 iso ,
578578 )
579579 elif self .media1 != "0" :
580- self .p (cfg .read_files_iso , f , "FOLDER" , folder , "SRCISO" , iso )
580+ self .p (cfg .read_files_iso , f , "FOLDER/ " , folder , "SRCISO" , iso )
581581 else :
582582 self .p (
583583 cfg .read_files_iso ,
584584 f ,
585- "FOLDER" ,
585+ "FOLDER/ " ,
586586 folder ,
587587 "SRCISO" ,
588588 iso ,
0 commit comments