spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 05:14:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: arch compilation optimizations output file path

Browse Source
This commit is contained in:
Vinicius Moreira
2019-09-24 18:39:38 -03:00
parent c8ed693b2f
commit 029dad7dfb
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bauh/gems/arch/worker.py
View File

@@ -15,7 +15,7 @@ URL_INDEX = 'https://aur.archlinux.org/packages.gz'
URL_INFO = 'https://aur.archlinux.org/rpc/?v=5&type=info&arg={}' URL_INFO = 'https://aur.archlinux.org/rpc/?v=5&type=info&arg={}'
GLOBAL_MAKEPKG = '/etc/makepkg.conf' GLOBAL_MAKEPKG = '/etc/makepkg.conf'
USER_MAKEPKG = '{}/makepkg.conf'.format(HOME_PATH) USER_MAKEPKG = '{}/.makepkg.conf'.format(HOME_PATH)
RE_MAKE_FLAGS = re.compile(r'#?\s*MAKEFLAGS\s*=\s*.+\s*') RE_MAKE_FLAGS = re.compile(r'#?\s*MAKEFLAGS\s*=\s*.+\s*')
RE_COMPRESS_XZ = re.compile(r'#?\s*COMPRESSXZ\s*=\s*.+') RE_COMPRESS_XZ = re.compile(r'#?\s*COMPRESSXZ\s*=\s*.+')
@@ -81,7 +81,7 @@ class ArchCompilationOptimizer(Thread if bool(os.getenv('BAUH_DEBUG', 0)) else P
ncpus = ceil(os.cpu_count() * 1.5) ncpus = ceil(os.cpu_count() * 1.5)
except: except:
self.logger.error('Could not determine the number of processors. Aborting...') self.logger.error('Could not determine the number of processors. Aborting...')
return ncpus = None
if os.path.exists(GLOBAL_MAKEPKG) and not os.path.exists(USER_MAKEPKG): if os.path.exists(GLOBAL_MAKEPKG) and not os.path.exists(USER_MAKEPKG):
self.logger.info("Verifying if it is possible to optimize Arch packages compilation") self.logger.info("Verifying if it is possible to optimize Arch packages compilation")
@@ -89,21 +89,21 @@ class ArchCompilationOptimizer(Thread if bool(os.getenv('BAUH_DEBUG', 0)) else P
with open(GLOBAL_MAKEPKG) as f: with open(GLOBAL_MAKEPKG) as f:
global_makepkg = f.read() global_makepkg = f.read()
user_makepkg = None user_makepkg, optimizations = None, []
optimizations = []
makeflags = RE_MAKE_FLAGS.findall(global_makepkg) if ncpus:
makeflags = RE_MAKE_FLAGS.findall(global_makepkg)
if makeflags: if makeflags:
not_commented = [f for f in makeflags if not f.startswith('#')] not_commented = [f for f in makeflags if not f.startswith('#')]
if not not_commented: if not not_commented:
user_makepkg = RE_MAKE_FLAGS.sub('', global_makepkg) user_makepkg = RE_MAKE_FLAGS.sub('', global_makepkg)
optimizations.append('MAKEFLAGS="-j{}"'.format(ncpus)) optimizations.append('MAKEFLAGS="-j{}"'.format(ncpus))
else:
self.logger.warning("It seems '{}' compilation flags are already customized".format(GLOBAL_MAKEPKG))
else: else:
self.logger.warning("It seems '{}' compilation flags are already customized".format(GLOBAL_MAKEPKG)) optimizations.append('MAKEFLAGS="-j{}"'.format(ncpus))
else:
optimizations.append('MAKEFLAGS="-j{}"'.format(ncpus))
compress_xz = RE_COMPRESS_XZ.findall(user_makepkg if user_makepkg else global_makepkg) compress_xz = RE_COMPRESS_XZ.findall(user_makepkg if user_makepkg else global_makepkg)