From e4b7d06f43d0b9204505521a6b6fd965e8d56d68 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: May 21 2020 10:39:44 +0000 Subject: spectool: create parent directory if required + fix _sourcedir expansion --- diff --git a/rpmdev-spectool b/rpmdev-spectool index 20761c7..a6bfa00 100755 --- a/rpmdev-spectool +++ b/rpmdev-spectool @@ -278,6 +278,7 @@ class Spec: if not dry: try: print("Downloading: {}".format(value)) + os.makedirs(directory, exist_ok=True) really = get_file(value, os.path.join(directory, basename), force) if really: print("Downloaded: {}".format(basename)) @@ -391,13 +392,7 @@ def main() -> int: if args["directory"]: directory = args["directory"] elif args["sourcedir"]: - ret = subprocess.run( - ["rpm", "--eval", "%{_sourcedir}"], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - ) - ret.check_returncode() - directory = ret.stdout.decode().strip() + directory = rpm.expandMacro("%{_sourcedir}") else: directory = os.getcwd()