Verified Commit dfe74c93 authored by Oskar Roesler's avatar Oskar Roesler
Browse files

Fix broken refactoring from repos_path -> pkgrepo_path

parent b04a94e1
......@@ -11,7 +11,7 @@ class Clone(Routines):
self.gh_organization_name, self.package)
def cloning(self):
Repo.clone_from(self.url, self.repos_path)
Repo.clone_from(self.url, self.pkgrepo_path)
def clone(self):
if self.package == "all":
......@@ -32,7 +32,7 @@ class Pull(Routines):
for folder in os.listdir(self.packages_path):
t.submit(Pull(folder, self.verbosity, self.output).pull)
else:
repo = Repo(path=self.repos_path)
repo = Repo(path=self.pkgrepo_path)
repo.git.stash()
repo.git.stash("clear")
head_before = repo.head.object.hexsha
......
......@@ -24,11 +24,11 @@ class Packages(Routines):
self.check_and_create_path(self.localrepo_path)
def makepkg(self):
if os.path.isfile(os.path.join(self.repos_path, "PKGBUILD")):
if os.path.isfile(os.path.join(self.pkgrepo_path, "PKGBUILD")):
try:
subprocess.run([MAKECHROOTPKG_BIN, '-c', '-d', self.localrepo_path, '-r',
self.chroot], stdout=(None if self.verbosity else subprocess.DEVNULL),
stderr=subprocess.STDOUT, cwd=self.repos_path, check=True)
stderr=subprocess.STDOUT, cwd=self.pkgrepo_path, check=True)
with open("success.txt", "a") as fobj:
fobj.write(self.package + "\n")
if self.output:
......@@ -40,7 +40,7 @@ class Packages(Routines):
raise RuntimeWarning(
"Building of {0} failed".format(self.package))
else:
raise FileNotFoundError("No PKBUILD existing: ", self.repos_path)
raise FileNotFoundError("No PKBUILD existing: ", self.pkgrepo_path)
try:
subprocess.run([REPO_ADD_BIN, 'localhost.db.tar.zst'] + glob.glob(os.path.join(self.localrepo_path, '*.pkg.tar.*')),
check=True, cwd=self.localrepo_path)
......@@ -59,14 +59,14 @@ class Packages(Routines):
os.remove(pkg)
def mvpkg(self):
for pkg_path in glob.iglob(self.repos_path + "/*pkg.tar*"):
for pkg_path in glob.iglob(self.pkgrepo_path + "/*pkg.tar*"):
shutil.move(pkg_path, "./repository/")
def aur_push(self):
try:
pkg_repo = Repo(path=self.repos_path).remote(name='aur')
pkg_repo = Repo(path=self.pkgrepo_path).remote(name='aur')
except ValueError:
pkg_repo = Repo(path=self.repos_path).create_remote(
pkg_repo = Repo(path=self.pkgrepo_path).create_remote(
'aur', "aur@aur.archlinux.org:/{0}.git".format(self.package))
pkg_repo.fetch()
try:
......
......@@ -25,7 +25,7 @@ class Update(Routines):
self.package_info = self.metainfo_dict[self.package]
def update_pkgbuild(self):
os.chdir(self.repos_path)
os.chdir(self.pkgrepo_path)
if not self.package_info.get('pkgver', None):
print('pkgver not in dict: {}'.format(self.package))
return (self.package, 'no_tag')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment