Skip to content

Commit a01751d

Browse files
committed
Merge branch 'pacman-debug' into dev
2 parents 067f515 + ace3e91 commit a01751d

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ _usage () {
165165
echo " --noloopmod No check and load kernel module automatically"
166166
echo " --nodepend No check package dependencies before building"
167167
echo " --noiso No build iso image (Use with --tarball)"
168+
echo " --pacman-debug Enable pacman debug mode"
168169
echo " --normwork No remove working dir"
169170
echo " --nopkgbuild Ignore PKGBUILD (Use only for debugging)"
170171
echo
@@ -1073,7 +1074,7 @@ make_iso() {
10731074
# Parse options
10741075
ARGUMENT=("${@}")
10751076
OPTS="a:bc:deg:hjk:l:o:p:rt:u:w:x"
1076-
OPTL="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck,normwork,log,logpath:,nolog,nopkgbuild"
1077+
OPTL="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck,normwork,log,logpath:,nolog,nopkgbuild,pacman_debug"
10771078
if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- ${DEFAULT_ARGUMENT} "${ARGUMENT[@]}"); then
10781079
exit 1
10791080
fi
@@ -1220,6 +1221,10 @@ while true; do
12201221
source "${2}"
12211222
shift 2
12221223
;;
1224+
--pacman-debug)
1225+
pacman_debug=true
1226+
shift 1
1227+
;;
12231228
--nosigcheck)
12241229
nosigcheck=true
12251230
shift 1

default.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ normwork=false
259259
# If debug is set to true, debug messages useful for channel development will be displayed.
260260
bash_debug=false
261261
debug=false
262+
pacman_debug=false
262263

263264
# If set to true, enable message debag.
264265
# This option previously debugged the message output in build.sh, but now it debugs msg.sh.

docs/Todo.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@
6060
- [x] x86_64
6161
- [x] en
6262
- [x] ja
63+
64+
- pacmanのデバッグをmkalteriso上でサポートする
65+
- aur.shを実行する際に`pacman_debug`の値によってaur.shのオプションを変更する

0 commit comments

Comments
 (0)