February 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Don't interpret format specifiers in msg
by Niklas Holm 23 Feb '18

23 Feb '18

Message string containing for example windows paths would have unexpected behaviour. For example the message "Check C:\foo\bar" would be printed as "Check C:<newline> oar". Signed-off-by: Niklas Holm <jadedcyborg(a)gmail.com> --- scripts/libmakepkg/util/message.sh.in | 15 +++++---------- scripts/library/output_format.sh | 18 ++++++------------ 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/scripts/libmakepkg/util/message.sh.in b/scripts/libmakepkg/util/message.sh.in index 33808de7..90799640 100644 --- a/scripts/libmakepkg/util/message.sh.in +++ b/scripts/libmakepkg/util/message.sh.in @@ -44,26 +44,21 @@ colorize() { } plain() { - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BOLD} %s${ALL_OFF}\n" "$1" >&2 } msg() { - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${GREEN}==>${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } msg2() { - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BLUE} ->${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } warning() { - local mesg=$1; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } error() { - local mesg=$1; shift - printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } diff --git a/scripts/library/output_format.sh b/scripts/library/output_format.sh index 9f02c00b..2049aab3 100644 --- a/scripts/library/output_format.sh +++ b/scripts/library/output_format.sh @@ -1,32 +1,26 @@ plain() { (( QUIET )) && return - local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${BOLD} %s${ALL_OFF}\n" "$1" >&1 } msg() { (( QUIET )) && return - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${GREEN}==>${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&1 } msg2() { (( QUIET )) && return - local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&1 + printf "${BLUE} ->${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&1 } ask() { - local mesg=$1; shift - printf "${BLUE}::${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}" "$@" >&1 + printf "${BLUE}::${ALL_OFF}${BOLD} %s${ALL_OFF}" "$1" >&1 } warning() { - local mesg=$1; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } error() { - local mesg=$1; shift - printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} %s${ALL_OFF}\n" "$1" >&2 } -- 2.16.2

3 4

[pacman-dev] [PATCH v3 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- As per agregory's request in #archlinux-pacman, this version of the patch leaves the check for '?' well enough alone. '?' is getopt_long(3)'s way of indicating user error, and we can think of default: as indicating options forgotten in development. src/pacman/pacman-conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..3c9a80e2 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -59,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = ""; + const char *short_opts = "c:hlR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, -- 2.16.1

2 7

[pacman-dev] [PATCH v2 1/5] pacman-conf.c: accept short options
by iff＠escondida.tk 11 Feb '18

11 Feb '18

From: Ivy Foster <iff(a)escondida.tk> Signed-off-by: Ivy Foster <iff(a)escondida.tk> --- This verion of the patch simply drops the check for '?', since it's caught by "default" anyway. The other patches are unchanged, except where rebased against this modified patch. src/pacman/pacman-conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 1e6f55f9..0f81ece6 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -59,7 +59,7 @@ static void parse_opts(int argc, char **argv) int c; config_file = CONFFILE; - const char *short_opts = ""; + const char *short_opts = "c:hlR:r:Vv"; struct option long_opts[] = { { "config" , required_argument , NULL , 'c' }, { "rootdir" , required_argument , NULL , 'R' }, @@ -96,7 +96,6 @@ static void parse_opts(int argc, char **argv) cleanup(); exit(0); break; - case '?': default: usage(1); break; -- 2.16.1

1 4

[pacman-dev] [PATCH 0/5] Miscellaneous pacman-conf tweaks
by iff＠escondida.tk 09 Feb '18

09 Feb '18

From: Ivy Foster <iff(a)escondida.tk> I started fiddling around with pacman-conf today, because I wanted to add short options to it, and then just sort of...kept on for a bit. Oh, I could be wrong, but I think that 'pacman-conf --repo <foo>' pretty much covers [FS#25568][1]. [1]: https://bugs.archlinux.org/task/25568 Ivy Foster (5): pacman-conf: accept short options pacman-conf: simplify usage() pacman-conf: Make myname and myver into cpp macros MYNAME and MYVER pacman-conf: Make cleanup run automagically at exit pacman-conf.c: make parse_opts only parse opts src/pacman/pacman-conf.c | 84 +++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) -- 2.16.1

3 8

[pacman-dev] [PATCH] makepkg --packagelist: just list the built package files we will build
by Eli Schwartz 08 Feb '18

08 Feb '18

Currently this seems to be only theoretically useful. The most likely reason for wanting a packagelist is in order to script makepkg and derive the filenames for the packages we want to install or repo-add, but in the current implementation this requires a lot of additional post-processing which must be duplicated in every utility to wrap makepkg. - It is of minimal use to know what packages might get created on some other device utilizing a different CPU/OS architecture, so don't list them. - It is non-trivial to reimplement makepkg's logic for sourcing any of several makepkg.conf configuration files, then applying environment overrides in order to get the PKGDEST and PKGEXT, so include them directly in the returned filenames. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2a4bd3af..6cfda0b3 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -149,14 +149,12 @@ print_all_package_names() { local version=$(get_full_version) local architecture pkg opts a for pkg in ${pkgname[@]}; do - get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + architecture=$(get_pkg_arch $pkg) get_pkgbuild_attribute "$pkg" 'options' 1 opts - for a in ${architecture[@]}; do - printf "%s-%s-%s\n" "$pkg" "$version" "$a" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then - printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" - fi - done + printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" + fi done } -- 2.15.0

2 8