Skip to content

Commit d55e177

Browse files
andrii-suseandrii-suse
committed
Fix missing $arch in read_files for Media1
the problem was introduced in 92d45
1 parent c71e548 commit d55e177

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎script/scriptgen.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ def gen_read_files(self, f):
688688
"REPOORS",
689689
"",
690690
"files_repo.lst",
691-
"files_repo_{}.lst".format(os.path.basename(repodir.attrib["folder"]).lstrip("*")),
691+
"files_repo_{}.lst".format(os.path.basename(repodir.attrib["folder"]).strip("*")),
692692
"ARCHORS",
693693
archs.replace(" ", "|").replace("armv7hl", "armv7hl|armv7l"),
694694
)
@@ -702,25 +702,25 @@ def gen_read_files(self, f):
702702
if not archs:
703703
archs = self.ag.archs
704704
wild = ""
705+
arch = ""
705706
done = ""
706707
if archs:
707708
wild = "*" + archs + "*"
708709
if "Leap" in self.ag.envdir or "Jump" in self.ag.envdir or self.version_from_media:
709710
if " " in archs and self.repodirs and "1" != repodir.attrib.get("multiarch", ""):
710711
self.p("for arch in {}; do".format(archs), f)
711712
wild = "*$arch*"
713+
arch = "$arch"
712714
done = "done"
713715

714716
for repodir in self.repodirs:
715717
selffolder = ""
716718
if self.folder:
717719
selffolder = "/" + self.folder
718720
if "/" in self.folder or "/" in repodir.attrib["folder"]:
719-
repopath = self.ag.productpath + selffolder + "/*" + repodir.attrib["folder"] + "*" + suffix
721+
repopath = self.ag.productpath + selffolder + "/*" + repodir.attrib["folder"] + wild
720722
else:
721-
repopath = (
722-
self.ag.productrepopath() + selffolder + "/*" + repodir.attrib["folder"] + "*" + suffix
723-
)
723+
repopath = self.ag.productrepopath() + selffolder + "/*" + repodir.attrib["folder"] + wild
724724

725725
Media1Replace = "*Media1"
726726
if self.media1 == "0":
@@ -732,7 +732,7 @@ def gen_read_files(self, f):
732732
repopath,
733733
"Media1.lst",
734734
"Media1_{}.lst".format(
735-
os.path.basename(repodir.attrib["folder"]).lstrip("*") + repodir.get("archs", "")
735+
os.path.basename(repodir.attrib["folder"]).strip("*") + repodir.get("archs", arch)
736736
),
737737
"*Media1",
738738
Media1Replace,
@@ -931,7 +931,7 @@ def gen_print_rsync_repo(self, f):
931931
cfg.rsync_remodir_multiarch,
932932
f,
933933
"files_repo.lst",
934-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
934+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
935935
"PRODUCTREPOPATH",
936936
self.productrepopath() + xtrapath + r.attrib["folder"],
937937
)
@@ -940,7 +940,7 @@ def gen_print_rsync_repo(self, f):
940940
cfg.rsync_remodir_multiarch_debug,
941941
f,
942942
"files_repo.lst",
943-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
943+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
944944
"PRODUCTREPOPATH",
945945
self.productrepopath() + xtrapath + r.attrib["folder"],
946946
"RSYNCFILTER",
@@ -974,7 +974,7 @@ def gen_print_rsync_repo(self, f):
974974
"PRODUCTREPOPATH",
975975
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
976976
"files_repo.lst",
977-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
977+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
978978
"Media2",
979979
"Media1",
980980
"-debuginfo",
@@ -995,7 +995,7 @@ def gen_print_rsync_repo(self, f):
995995
"PRODUCTREPOPATH",
996996
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
997997
"files_repo.lst",
998-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
998+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
999999
"RSYNCFILTER",
10001000
" --include=PACKAGES --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*".replace(
10011001
"PACKAGES", r.attrib["debug"]
@@ -1015,7 +1015,7 @@ def gen_print_rsync_repo(self, f):
10151015
"PRODUCTREPOPATH",
10161016
self.productpath() + xtrapath + r.attrib["folder"] + suffix,
10171017
"files_repo.lst",
1018-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
1018+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
10191019
"RSYNCFILTER",
10201020
" --include=PACKAGES --exclude={aarch64,armv7hl,i586,i686,noarch,nosrc,ppc64,ppc64le,riscv64,s390x,src,x86_64}/*".replace(
10211021
"PACKAGES", r.attrib["source"]
@@ -1245,7 +1245,7 @@ def gen_print_openqa(self, f):
12451245
cfg.openqa_call_repot2.format(media_filter),
12461246
f,
12471247
"files_repo.lst",
1248-
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).lstrip("*")),
1248+
"files_repo_{}.lst".format(os.path.basename(r.attrib["folder"]).strip("*")),
12491249
"DEBUG_PACKAGES",
12501250
r.attrib.get("debug", "").strip("{}"),
12511251
"SOURCE_PACKAGES",

‎t/obs/SUSE:ALP:Products:Bedrock:0.1/Media1_000product:ALP-Bedrock-ftp-POOL*.lst‎ renamed to ‎t/obs/SUSE:ALP:Products:Bedrock:0.1/Media1_000product:ALP-Bedrock-ftp-POOL.lst‎

File renamed without changes.

‎t/obs/SUSE:ALP:Products:Bedrock:0.1/files_repo_000product:ALP-Bedrock-ftp-POOL*.lst‎ renamed to ‎t/obs/SUSE:ALP:Products:Bedrock:0.1/files_repo_000product:ALP-Bedrock-ftp-POOL.lst‎

File renamed without changes.

‎t/obs/SUSE:ALP:Products:Micro:0.1/Media1_000product:ALP-Micro-ftp-POOL*.lst‎ renamed to ‎t/obs/SUSE:ALP:Products:Micro:0.1/Media1_000product:ALP-Micro-ftp-POOL.lst‎

File renamed without changes.

‎t/obs/SUSE:ALP:Products:Micro:0.1/files_repo_000product:ALP-Micro-ftp-POOL*.lst‎ renamed to ‎t/obs/SUSE:ALP:Products:Micro:0.1/files_repo_000product:ALP-Micro-ftp-POOL.lst‎

File renamed without changes.

0 commit comments

Comments
 (0)