From 759162004d7547f21ee97ec28f475cceb8248640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Moreira?= Date: Tue, 14 Apr 2020 14:38:14 -0300 Subject: [PATCH] [fix][arch] error when building AUR packages with extensions different from .tar.xz --- CHANGELOG.md | 2 ++ bauh/gems/arch/controller.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42f1352f..faa056bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Arch / AUR: - sorting algorithm was providing wrong results for some cases - not caching data about packages with no desktop entry files + - error output when was not able to optimize the **makepkg.conf** [#84](https://github.com/vinifmor/bauh/issues/84) + - error when building AUR packages with extensions different from .tar.xz [#84](https://github.com/vinifmor/bauh/issues/84) ### Settings - Default diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py index 67494e84..5da40c72 100644 --- a/bauh/gems/arch/controller.py +++ b/bauh/gems/arch/controller.py @@ -1198,10 +1198,10 @@ class ArchManager(SoftwareManager): self._update_progress(context, 65) if pkgbuilt: - gen_file = [fname for root, dirs, files in os.walk(context.build_dir) for fname in files if re.match(r'^{}-.+\.tar\.xz'.format(context.name), fname)] + gen_file = [fname for root, dirs, files in os.walk(context.build_dir) for fname in files if re.match(r'^{}-.+\.tar\.(xz|ztd)'.format(context.name), fname)] if not gen_file: - context.watcher.print('Could not find generated .tar.xz file. Aborting...') + context.watcher.print('Could not find the built package. Aborting...') return False context.install_file = '{}/{}'.format(context.project_dir, gen_file[0])