Skip to content

Commit 1ef04e6

Browse files
committed
Fix read_files.sh for Factory/base
followup from #307
1 parent 4fb5b0f commit 1ef04e6

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

script/scriptgen.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -659,11 +659,19 @@ def gen_read_files(self, f):
659659
suffix = ""
660660
if repodir.attrib.get("suffix"):
661661
suffix = repodir.attrib["suffix"]
662+
repopath = ""
663+
if "/" in self.folder:
664+
repopath = self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix
665+
else:
666+
repopath = (
667+
self.ag.productrepopath() + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix
668+
)
669+
662670
args = (
663671
cfg.read_files_repo,
664672
f,
665673
txt,
666-
self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + "*" + suffix,
674+
repopath,
667675
"REPOORS",
668676
"",
669677
"files_repo.lst",
@@ -701,21 +709,6 @@ def gen_read_files(self, f):
701709
os.path.basename(repodir.attrib["folder"]).lstrip("*") + repodir.get("archs", "")
702710
),
703711
)
704-
elif "Factory" or "LEO" in self.ag.envdir:
705-
for repodir in self.repodirs:
706-
if not repodir.attrib.get("gen", ""):
707-
self.p(
708-
cfg.read_files_repo_media + cfg.read_files_repo_media_convert,
709-
f,
710-
"PRODUCTREPOPATH",
711-
self.ag.productpath + "/" + self.folder + "/*" + repodir.attrib["folder"] + wild,
712-
"Media1.lst",
713-
"",
714-
"destlst",
715-
"Media1_{}.lst".format(os.path.basename(repodir.attrib["folder"]).lstrip("*")),
716-
"media.1/media",
717-
"media.1/products",
718-
)
719712

720713
if done:
721714
self.p(done, f)

0 commit comments

Comments
 (0)