@@ -361,9 +361,9 @@ def doFlavor(self, node):
361
361
self .isos .append (iso )
362
362
if node .attrib .get ("ln_iso_to_repo" , "" ):
363
363
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" ]
367
367
368
368
for t in node .findall (".//isos/*" ):
369
369
self .isos .append (t .tag )
@@ -559,15 +559,15 @@ def gen_read_files(self, f):
559
559
self .p (cfg .read_files_isos , f )
560
560
else :
561
561
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 + "/"
565
565
566
566
if "*" in iso :
567
567
self .p (
568
568
cfg .read_files_iso ,
569
569
f ,
570
- "FOLDER" ,
570
+ "FOLDER/ " ,
571
571
folder ,
572
572
"SRCISO" ,
573
573
"" ,
@@ -577,12 +577,12 @@ def gen_read_files(self, f):
577
577
iso ,
578
578
)
579
579
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 )
581
581
else :
582
582
self .p (
583
583
cfg .read_files_iso ,
584
584
f ,
585
- "FOLDER" ,
585
+ "FOLDER/ " ,
586
586
folder ,
587
587
"SRCISO" ,
588
588
iso ,
0 commit comments