do not read aur_url from settings, use repository property instead

This commit is contained in:
Evgenii Alekseev 2021-11-15 11:27:41 +03:00
parent 32b129a806
commit a9e20f0958

View File

@ -64,8 +64,7 @@ class Packages(Properties):
:param known_packages: list of packages which are known by the service :param known_packages: list of packages which are known by the service
:param without_dependencies: if set, dependency check will be disabled :param without_dependencies: if set, dependency check will be disabled
""" """
aur_url = self.configuration.get("alpm", "aur_url") package = Package.load(source, PackageSource.AUR, self.repository.pacman, self.repository.aur_url)
package = Package.load(source, PackageSource.AUR, self.repository.pacman, aur_url)
local_path = self.repository.paths.manual_for(package.base) local_path = self.repository.paths.manual_for(package.base)
Sources.load(local_path, package.git_url, self.repository.paths.patches_for(package.base)) Sources.load(local_path, package.git_url, self.repository.paths.patches_for(package.base))
@ -87,8 +86,7 @@ class Packages(Properties):
:param known_packages: list of packages which are known by the service :param known_packages: list of packages which are known by the service
:param without_dependencies: if set, dependency check will be disabled :param without_dependencies: if set, dependency check will be disabled
""" """
aur_url = self.configuration.get("alpm", "aur_url") package = Package.load(source, PackageSource.Local, self.repository.pacman, self.repository.aur_url)
package = Package.load(source, PackageSource.Local, self.repository.pacman, aur_url)
cache_dir = self.repository.paths.cache_for(package.base) cache_dir = self.repository.paths.cache_for(package.base)
shutil.copytree(Path(source), cache_dir) # copy package to store in caches shutil.copytree(Path(source), cache_dir) # copy package to store in caches
Sources.init(cache_dir) # we need to run init command in directory where we do have permissions Sources.init(cache_dir) # we need to run init command in directory where we do have permissions