From: Jan Palus Date: Wed, 4 Jan 2023 20:25:56 +0000 (+0100) Subject: sort-pkgs: for packages dir try evaluting %_topdir X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=3fc1a82323d8ee94ff2c260e31823088422af782;p=packages%2Frpm-build-tools.git sort-pkgs: for packages dir try evaluting %_topdir --- diff --git a/sort-pkgs b/sort-pkgs index 7b1fa41..07c1ac3 100755 --- a/sort-pkgs +++ b/sort-pkgs @@ -16,7 +16,15 @@ BR_PATTERN = re.compile('BuildRequires:\s+(.*?)(\s|$)') PACKAGE_PATTERN_WITH_N = re.compile('%package\s+-n\s+(.*)') PACKAGE_PATTERN = re.compile('%package\s+(.*)') -DIR = os.getenv("HOME") + '/rpm/packages' +try: + import rpm + DIR = rpm.expandMacro('%_topdir') +except ModuleNotFoundError: + try: + import subprocess + DIR = subprocess.check_output(['rpm', '-E', '%_topdir']).decode('utf-8').strip() + except: + DIR = os.getenv("HOME") + '/rpm/packages' BUILD_REQUIRES = {} PACKAGES = {}