From e96843828d8c3bbd8d63f196cac780108598b1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Mon, 14 Mar 2022 02:11:40 +0100 Subject: generate-fastlane-metadata: Don't fail if source URL can not be found I hit this issue while building Kaidan using craft, outside of the KDE Android docker container. Hopefully this is the correct way to fix it. --- toolchain/generate-fastlane-metadata.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/toolchain/generate-fastlane-metadata.py b/toolchain/generate-fastlane-metadata.py index 642a76d3..051a231d 100755 --- a/toolchain/generate-fastlane-metadata.py +++ b/toolchain/generate-fastlane-metadata.py @@ -341,9 +341,8 @@ def processAppstreamFile(appstreamFileName, desktopFileName, iconBaseName): if arguments.source and os.path.exists(os.path.join(arguments.source, '.git')): upstream_ref = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}'], cwd=arguments.source).decode('utf-8') remote = upstream_ref.split('/')[2] - output = subprocess.check_output(['git', 'remote', 'show', '-n', remote], cwd=arguments.source).decode('utf-8') - result = re.search(' Fetch URL: (.*)\n', output) - data['source-repo'] = result.group(1) + output = subprocess.check_output(['git', 'remote', 'get-url', remote], cwd=arguments.source).decode('utf-8') + data['source-repo'] = output.strip() # write meta data createFastlaneFile( applicationName, "title.txt", data['name'] ) -- cgit v1.2.1