Merge pull request #57 from L0ric0/master

paccommand option in ini-file
Kwpolska · Jul 31, 2018 · c2843eb · c2843eb
2 parents f8a62d9 + 0040ab7
commit c2843eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkgbuilder/data/pkgbuilder.ini.skel b/pkgbuilder/data/pkgbuilder.ini.skel
@@ -23,3 +23,4 @@ verbosepkglists=true
 ; overrides -S, useful if /tmp is small
 ; (default: empty/unused)
 chdir=
+paccommand=pacman
diff --git a/pkgbuilder/pbds.py b/pkgbuilder/pbds.py
@@ -62,11 +62,6 @@ class PBDS(object):
     console = None
     _pyc = None
 
-    if os.getenv('PACMAN') is None:
-        paccommand = 'pacman'
-    else:
-        paccommand = os.getenv('PACMAN')
-
     hassudo = os.path.exists('/usr/bin/sudo')
 
     uid = os.geteuid()
@@ -100,6 +95,11 @@ class PBDS(object):
         'pkgbuilder', 'data/pkgbuilder.ini.skel').decode('utf-8'))
     config.read([confpath], encoding='utf-8')
 
+    if os.getenv('PACMAN') is None:
+        paccommand = config.get('extras', 'paccommand', fallback='pacman')
+    else:
+        paccommand = os.getenv('PACMAN')
+
     # Language changing
     language = config.get('PKGBUILDer', 'language')
     if language != 'auto':