anonfunc/alhp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more logging improvement

Browse Source
This commit is contained in:
Giovanni Harting
2020-08-13 12:29:05 +02:00
parent 465388922f
commit 4bfef96f26
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
master.py
View File

@@ -49,6 +49,12 @@ def get_failed_packages(repo):
return [] return []
def build_cleanup():
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT).stdout.decode())
os.chdir(sys.path[0])
def build(pkgbuild, repo): def build(pkgbuild, repo):
start_time = time.time() start_time = time.time()
name = pathlib.Path(pkgbuild).parts[-4] name = pathlib.Path(pkgbuild).parts[-4]
@@ -70,15 +76,13 @@ def build(pkgbuild, repo):
with open(os.path.join(config["basedir"]["repo"], repo + "_failed.txt"), "a") as f: with open(os.path.join(config["basedir"]["repo"], repo + "_failed.txt"), "a") as f:
f.write(name + "\n") f.write(name + "\n")
# write logs to file # write logs
if not os.path.exists(os.path.join(config["basedir"]["repo"], "logs", repo)): if not os.path.exists(os.path.join(config["basedir"]["repo"], "logs", repo)):
pathlib.Path(os.path.join(config["basedir"]["repo"], "logs", repo)).mkdir(parents=True, exist_ok=True) pathlib.Path(os.path.join(config["basedir"]["repo"], "logs", repo)).mkdir(parents=True, exist_ok=True)
with open(os.path.join(config["basedir"]["repo"], "logs", repo, name + ".log"), "w") as log: with open(os.path.join(config["basedir"]["repo"], "logs", repo, name + ".log"), "w") as log:
log.write(res.stdout.decode()) log.write(res.stdout.decode())
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE, build_cleanup()
stderr=subprocess.STDOUT).stdout.decode())
os.chdir(sys.path[0])
return return
# signing # signing
@@ -88,9 +92,7 @@ def build(pkgbuild, repo):
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
if s_res.returncode: if s_res.returncode:
logging.error("[%s/%s] Signing failed: %s", repo, name, s_res.stdout.decode()) logging.error("[%s/%s] Signing failed: %s", repo, name, s_res.stdout.decode())
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE, build_cleanup()
stderr=subprocess.STDOUT).stdout.decode())
os.chdir(sys.path[0])
return return
# copying # copying
@@ -104,28 +106,24 @@ def build(pkgbuild, repo):
r_res = subprocess.run(["repo-add", "-s", "-v", r_res = subprocess.run(["repo-add", "-s", "-v",
os.path.join(config["basedir"]["repo"], repo, "os", config["arch"], repo + ".db.tar.xz"), os.path.join(config["basedir"]["repo"], repo, "os", config["arch"], repo + ".db.tar.xz"),
pkgs[0]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) pkgs[0]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
logging.debug("[REPO-ADD] %s", r_res.stdout.decode())
if r_res.returncode: if r_res.returncode:
logging.error("[%s/%s] Repo action failed: %s", repo, name, r_res.stdout.decode()) logging.error("[%s/%s] Repo action failed: %s", repo, name, r_res.stdout.decode())
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE, build_cleanup()
stderr=subprocess.STDOUT).stdout.decode())
os.chdir(sys.path[0])
return return
p_res = subprocess.run( p_res = subprocess.run(
["paccache", "-rc", os.path.join(config["basedir"]["repo"], repo, "os", config["arch"]), "-k", "1"], ["paccache", "-rc", os.path.join(config["basedir"]["repo"], repo, "os", config["arch"]), "-k", "1"],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
logging.debug("[PACCACHE] %s", p_res.stdout.decode())
if p_res.returncode: if p_res.returncode:
logging.error("[%s/%s] Repo cleanup failed: %s", repo, name, p_res.stdout.decode()) logging.error("[%s/%s] Repo cleanup failed: %s", repo, name, p_res.stdout.decode())
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE, build_cleanup()
stderr=subprocess.STDOUT).stdout.decode())
os.chdir(sys.path[0])
return return
# cleanup # cleanup
logging.debug("[GIT] %s", subprocess.run(["git", "clean", "-xdf"], check=True, stdout=subprocess.PIPE, build_cleanup()
stderr=subprocess.STDOUT).stdout.decode()) logging.info("[%s/%s] Build successful (%s)", repo, name, int(time.time() - start_time))
os.chdir(sys.path[0])
logging.info("[%s/%s] Build successful (%s)", repo, name, time.time() - start_time)
def setup_makepkg(repo): def setup_makepkg(repo):