Attempt to resolve RLBT#0000133

This commit is contained in:
Louis Abel 2022-06-30 15:38:50 -07:00
parent 7f6f7babf5
commit 4bc377cd44
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
6 changed files with 23 additions and 5 deletions

View File

@ -2,6 +2,7 @@
import argparse
import empanadas
from empanadas.common import *
from empanadas.util import Checks
from empanadas.util import RepoSync
@ -16,3 +17,4 @@ a = RepoSync(rlvars, config, major="9", repo="BaseOS", parallel=True, ignore_deb
def run():
print(rlvars.keys())
print(rlvars)
print(empanadas.__version__)

View File

@ -0,0 +1,6 @@
These set of repositories (or "compose") is for {{ fullname }} and was generated
using Empanadas {{ version }} from the SIG/Core Toolkit.
As this is not a traditional compose, there will be things that you might be
expecting and do not see, or not expecting and do see.. While we attempted to
recreate a lot of those elements, it's not perfect.

View File

@ -930,7 +930,9 @@ class RepoSync:
e.strerror
)
# Create metadata here?
# Create metadata here
# Create COMPOSE_ID here (this doesn't necessarily match anything, it's
# just an indicator)
self.log.info(
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
@ -999,7 +1001,7 @@ class RepoSync:
self.shortname,
self.fullversion,
a,
self.timestamp,
int(self.timestamp),
repo_name
)
else:

View File

@ -723,6 +723,12 @@ class IsoBuild:
repo
)
if not os.path.exists(pathway):
self.log.error(
'[' + Color.BOLD + Color.RED + 'FAIL' + Color.END + '] ' +
'Repo and Image variant do NOT match'
)
if not force_unpack:
found_files = []
for y in ArchCheck.archfile[arch]:
@ -747,6 +753,7 @@ class IsoBuild:
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
'Copying images and data for ' + repo + ' ' + arch
)
try:
shutil.copytree(src_to_image, pathway, copy_function=shutil.copy2, dirs_exist_ok=True)
except:

View File

@ -117,7 +117,8 @@ class Shared:
"%s" % timestamp,
"%s" % fullname,
"%s" % arch,
"ALL"
"ALL",
""
]
with open(file_path, "w+") as f:

View File

@ -1,8 +1,8 @@
[tool.poetry]
name = "empanadas"
version = "0.1.0"
version = "0.2.0"
description = "hand crafted ISOs with love and spice"
authors = ["Louis Abel <louis@rockylinux.org>", "Neil Hanlon <neil@rockylinux.org>"]
authors = ["Louis Abel <label@rockylinux.org>", "Neil Hanlon <neil@rockylinux.org>"]
[tool.poetry.dependencies]
python = ">=3.7,<4"