Skip to content

Fix missing $arch in read_files for Media1 #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2025
Merged

Fix missing $arch in read_files for Media1 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions script/scriptgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ def gen_read_files(self, f):
"REPOORS",
"",
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(repodir.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(repodir.attrib["folder"]).strip("*")),
"ARCHORS",
archs.replace(" ", "|").replace("armv7hl", "armv7hl|armv7l"),
)
Expand All @@ -702,25 +702,25 @@ def gen_read_files(self, f):
if not archs:
archs = self.ag.archs
wild = ""
arch = ""
done = ""
if archs:
wild = "*" + archs + "*"
if "Leap" in self.ag.envdir or "Jump" in self.ag.envdir or self.version_from_media:
if " " in archs and self.repodirs and "1" != repodir.attrib.get("multiarch", ""):
self.p("for arch in {}; do".format(archs), f)
wild = "*$arch*"
arch = "$arch"
done = "done"

for repodir in self.repodirs:
selffolder = ""
if self.folder:
selffolder = "/" + self.folder
if "/" in self.folder or "/" in repodir.attrib["folder"]:
repopath = self.ag.productpath + selffolder + "/*" + repodir.attrib["folder"] + "*" + suffix
repopath = self.ag.productpath + selffolder + "/*" + repodir.attrib["folder"] + wild
else:
repopath = (
self.ag.productrepopath() + selffolder + "/*" + repodir.attrib["folder"] + "*" + suffix
)
repopath = self.ag.productrepopath() + selffolder + "/*" + repodir.attrib["folder"] + wild

Media1Replace = "*Media1"
if self.media1 == "0":
Expand All @@ -732,7 +732,7 @@ def gen_read_files(self, f):
repopath,
"Media1.lst",
"Media1_{}.lst".format(
os.path.basename(repodir.attrib["folder"]).lstrip("*") + repodir.get("archs", "")
os.path.basename(repodir.attrib["folder"]).strip("*") + repodir.get("archs", arch)
),
"*Media1",
Media1Replace,
Expand Down Expand Up @@ -931,7 +931,7 @@ def gen_print_rsync_repo(self, f):
cfg.rsync_remodir_multiarch,
f,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"PRODUCTREPOPATH",
self.productrepopath() + xtrapath + r.attrib["folder"],
)
Expand All @@ -940,7 +940,7 @@ def gen_print_rsync_repo(self, f):
cfg.rsync_remodir_multiarch_debug,
f,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"PRODUCTREPOPATH",
self.productrepopath() + xtrapath + r.attrib["folder"],
"RSYNCFILTER",
Expand Down Expand Up @@ -974,7 +974,7 @@ def gen_print_rsync_repo(self, f):
"PRODUCTREPOPATH",
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"Media2",
"Media1",
"-debuginfo",
Expand All @@ -995,7 +995,7 @@ def gen_print_rsync_repo(self, f):
"PRODUCTREPOPATH",
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"RSYNCFILTER",
" --include=PACKAGES --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*".replace(
"PACKAGES", r.attrib["debug"]
Expand All @@ -1015,7 +1015,7 @@ def gen_print_rsync_repo(self, f):
"PRODUCTREPOPATH",
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"RSYNCFILTER",
" --include=PACKAGES --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*".replace(
"PACKAGES", r.attrib["source"]
Expand Down Expand Up @@ -1245,7 +1245,7 @@ def gen_print_openqa(self, f):
cfg.openqa_call_repot2.format(media_filter),
f,
"files_repo.lst",
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
"DEBUG_PACKAGES",
r.attrib.get("debug", "").strip("{}"),
"SOURCE_PACKAGES",
Expand Down
0 ...dia1_000product:ALP-Bedrock-ftp-POOL*.lst → ...edia1_000product:ALP-Bedrock-ftp-POOL.lst
View file
Open in desktop
File renamed without changes.
0 ...repo_000product:ALP-Bedrock-ftp-POOL*.lst → ..._repo_000product:ALP-Bedrock-ftp-POOL.lst
View file
Open in desktop
File renamed without changes.
0 ...Media1_000product:ALP-Micro-ftp-POOL*.lst → .../Media1_000product:ALP-Micro-ftp-POOL.lst
View file
Open in desktop
File renamed without changes.
0 ...s_repo_000product:ALP-Micro-ftp-POOL*.lst → ...es_repo_000product:ALP-Micro-ftp-POOL.lst
View file
Open in desktop
File renamed without changes.