November 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add option MaxDlSpeed to limit download speed
by Olivier Brunel 20 May '17

20 May '17

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- doc/pacman.8.txt | 5 +++++ doc/pacman.conf.5.txt | 6 ++++++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/dload.c | 1 + lib/libalpm/handle.c | 26 ++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 11 +++++++++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 11 +++++++++++ src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 ++ 11 files changed, 114 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 231e0bc..1890cd9 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -266,6 +266,11 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up-to-date. +*\--maxdlspeed* <speed>:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + Query Options (apply to '-Q')[[QO]] ----------------------------------- diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..49ce63b 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -201,6 +201,12 @@ Options bar is still based solely on the current file download. This option won't work if XferCommand is used. +*MaxDlSpeed*:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + This option won't work if XferCommand is used. + *CheckSpace*:: Performs an approximate check for adequate available disk space before installing packages. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 168d71b..7e4e9da 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -925,6 +925,9 @@ int alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t l alpm_siglevel_t alpm_option_get_remote_file_siglevel(alpm_handle_t *handle); int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +off_t alpm_option_get_maxdlspeed(alpm_handle_t *handle); +int alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 31ae82c..8c6d6af 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -295,6 +295,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, handle->maxdlspeed); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e9439a0..9cab5da 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -844,4 +844,30 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } +off_t SYMEXPORT alpm_option_get_maxdlspeed(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + return (off_t) handle->maxdlspeed; +#else + return 0; +#endif +} + +int SYMEXPORT alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + if(speed >= 0) { + handle->maxdlspeed = (curl_off_t) speed; + return 0; + } else +#else + if(speed == 0) + return 0; + else +#endif + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); +} + /* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a1d0f9a..f55b6ed 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,6 +60,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ + curl_off_t maxdlspeed; /* maximum download speed (B/s) */ #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..39cc15c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -544,6 +544,16 @@ static int _parse_options(const char *key, char *value, } config->deltaratio = ratio; pm_printf(ALPM_LOG_DEBUG, "config: usedelta = %f\n", ratio); + } else if(strcmp(key, "MaxDlSpeed") == 0) { + off_t speed = parsesize(value); + if(speed < 0) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "MaxDlSpeed", value); + return 1; + } + config->maxdlspeed = speed; + pm_printf(ALPM_LOG_DEBUG, "config: maxdlspeed = %jd\n", (intmax_t) speed); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -810,6 +820,7 @@ static int setup_libalpm(void) alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); + alpm_option_set_maxdlspeed(handle, config->maxdlspeed); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf..77353a2 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -56,6 +56,7 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; double deltaratio; + off_t maxdlspeed; char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_MAXDLSPEED }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..91f8500 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -194,6 +194,8 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); + addlist(_(" --maxdlspeed <speed>\n" + " set the maximum download speed\n")); /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); @@ -713,6 +715,14 @@ static int parsearg_upgrade(int opt) case OP_IGNOREGROUP: parsearg_util_addlist(&(config->ignoregrp)); break; + case OP_MAXDLSPEED: + { + off_t speed = parsesize(optarg); + if(speed < 0) + return 1; + config->maxdlspeed = speed; + break; + } default: return 1; } return 0; @@ -929,6 +939,7 @@ static int parseargs(int argc, char *argv[]) {"ignoregroup", required_argument, 0, OP_IGNOREGROUP}, {"needed", no_argument, 0, OP_NEEDED}, {"asexplicit", no_argument, 0, OP_ASEXPLICIT}, + {"maxdlspeed", required_argument, 0, OP_MAXDLSPEED}, {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, diff --git a/src/pacman/util.c b/src/pacman/util.c index 81780f7..35b4f23 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1763,4 +1763,49 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } +off_t parsesize(const char *str) +{ + long size; + char *endptr; + + size = strtol(str, &endptr, 10); + if((size == LONG_MIN || size == LONG_MAX) && errno == ERANGE) { + return -1; + } + if(*endptr != '\0') { + if(endptr[1] != '\0') { + return -1; + } + switch(*endptr) { + case 'g': + case 'G': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'm': + case 'M': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'k': + case 'K': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + break; + default: + return -1; + } + } + if(size < 0) { + return -1; + } + return (off_t) size; +} + /* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index f5e37c8..7d0a897 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -82,6 +82,8 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); +off_t parsesize(const char *str); + #endif /* _PM_UTIL_H */ /* vim: set noet: */ -- 2.9.3

3 2

[pacman-dev] [RFC] adding a --sysroot option
by Andrew Gregory 16 Apr '17

16 Apr '17

pacman's --root option is regularly (mis)used to use pacman to manage a mounted guest system, typically one whose pacman installation is currently broken. We have a few configuration defaults in place to make this sort of work, but support is incomplete. Those defaults only actually take effect if the settings haven't been set in a configuration file, several options still default to the host system resources, and using the guest's pacman configuration requires updating all configured paths to the new mounted location. Adding a --sysroot/--chroot option would allow pacman to properly operate in a mounted guest system. At the moment, there are two ways we could accomplish this: prefix all paths with the sysroot or just call chroot(2). Obviously, the problem with chroot(2) is that it requires special privileges. Unfortunately, I think my symbolic user/group patch (https://patchwork.archlinux.org/patch/3694/) will require chroot to work properly as I can't find any other way to look up users/groups in a mounted guest. So, we may have to implement both approaches so that regular users can perform queries but privileged users can perform transactions with proper symbolic name support. apg

2 5

[pacman-dev] [PATCH v2] Give a "success!" message on database check
by Patrick Eigensatz 08 Dec '16

08 Dec '16

'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> --- doc/pacman.8.txt | 6 +++++- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 2bafa41..0522981 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -456,7 +456,7 @@ Database Options (apply to '-D')[[QO]] package installed even when it was initially installed as a dependency of another package. -*-k \--check*:: +*-k, \--check*:: Check the local package database is internally consistent. This will check all required files are present and that installed packages have the required dependencies, do not conflict and that multiple packages @@ -464,6 +464,10 @@ Database Options (apply to '-D')[[QO]] a check on the sync databases to ensure all specified dependencies are available. +*-q, \--quiet*:: + Apply to '-q' or '--quiet' to suppress the message that the + database check was successful and no errors have been found. + File Options (apply to '-F')[[FO]] ---------------------------------- *-y, --refresh*:: diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..3990ea2 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("No database errors have been found!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..3881829 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -171,6 +171,7 @@ static void usage(int op, const char * const myname) addlist(_(" --asdeps mark packages as non-explicitly installed\n")); addlist(_(" --asexplicit mark packages as explicitly installed\n")); addlist(_(" -k, --check test local database for validity (-kk for sync databases)\n")); + addlist(_(" -q, --quiet Suppress the success message of the validity check\n")); } else if(op == PM_OP_DEPTEST) { printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -466,6 +467,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

2 7

[pacman-dev] [PATCH 1/4] makepkg: fix find_lib{depends, provides} results
by Andrew Gregory 02 Dec '16

02 Dec '16

Neither function was checking for the existence of actual results before calling printf, resulting in them returning a list with a single empty value if there were no depends/provides. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 02398cf..714b376 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -494,7 +494,7 @@ find_libdepends() { done if (( sodepends == 0 )); then - printf '%s\n' "${depends[@]}" + (( ${#depends[@]} )) && printf '%s\n' "${depends[@]}" return; fi @@ -543,7 +543,7 @@ find_libdepends() { esac done - printf '%s\n' "${libdepends[@]}" + (( ${#libdepends[@]} )) && printf '%s\n' "${libdepends[@]}" } @@ -594,7 +594,7 @@ find_libprovides() { fi done - printf '%s\n' "${libprovides[@]}" + (( ${#libprovides[@]} )) && printf '%s\n' "${libprovides[@]}" } write_pkginfo() { -- 2.10.2

2 5

[pacman-dev] [PATCH v2] Make DUFLAGS be overrideable during configure
by Alastair Hughes 02 Dec '16

02 Dec '16

Not all du implementations on linux accept --apparent-size, so let the user configure the arguments passed to du if required. This fixes FS#47943. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- configure.ac | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index dd4ac04..40062f2 100644 --- a/configure.ac +++ b/configure.ac @@ -327,12 +327,12 @@ AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h> GCC_VISIBILITY_CC # Host-dependant definitions +DEFAULT_DUFLAGS=" -sk --apparent-size" INODECMD="stat -c '%i %n'" OWNERCMD="stat -c '%u:%g'" MODECMD="stat -c '%a'" SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" -DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" @@ -343,7 +343,7 @@ case "${host_os}" in MODECMD="stat -f '%Lp'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" - DUFLAGS="-sk" + DEFAULT_DUFLAGS=" -sk" ;; darwin*) host_os_darwin=yes @@ -352,13 +352,12 @@ case "${host_os}" in MODECMD="/usr/bin/stat -f '%Lp'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" - DUFLAGS="-sk" + DEFAULT_DUFLAGS=" -sk" STRIP_BINARIES="" STRIP_SHARED="-S" STRIP_STATIC="-S" ;; esac - AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) @@ -366,11 +365,16 @@ AC_SUBST(OWNERCMD) AC_SUBST(MODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) -AC_SUBST(DUFLAGS) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) +# Flags for du +if test "${DUFLAGS+set}" != "set"; then + DUFLAGS="${DEFAULT_DUFLAGS}" +fi +AC_ARG_VAR(DUFLAGS, [flags for du, overriding the default]) + # Variables plugged into makepkg.conf CARCH="${host%%-*}" CHOST="${host}" -- 2.9.3

2 5

[pacman-dev] [PATCH v3] Parametrise the different ways in which the payload is reset
by Martin Kühne 02 Dec '16

02 Dec '16

In FS#43434, Downloads which fail and are restarted on a different server will resume and may display a negative download speed. The payload's progress in libalpm was not properly reset which ultimately caused terminal noise because the line width calculation assumes positive download speeds. This patch fixes the incomplete reset of the payload by mimicing what be_sync.c:alpm_db_update() does over in sync.c:download_single_file(). The new dload.c:_alpm_dload_payload_reset_for_retry() extends beyond the current behavior by updating initial_size and prevprogress for this case. This makes pacman reset the progress properly in the next invocation of the callback and display positive download speeds. Fixes FS#43434. Signed-off-by: Martin Kühne <mysatyre(a)gmail.com> --- lib/libalpm/dload.c | 10 ++++++++++ lib/libalpm/dload.h | 1 + lib/libalpm/sync.c | 4 +--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index dc57c92..855099b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -762,4 +762,14 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) memset(payload, '\0', sizeof(*payload)); } +void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload) +{ + ASSERT(payload, return); + + FREE(payload->fileurl); + payload->initial_size += payload->prevprogress; + payload->prevprogress = 0; + payload->unlink_on_fail = 0; +} + /* vim: set noet: */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 427c486..3459665 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -47,6 +47,7 @@ struct dload_payload { }; void _alpm_dload_payload_reset(struct dload_payload *payload); +void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, char **final_file, const char **final_url); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 00b68d0..a1f673f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -946,9 +946,7 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay EVENT(handle, &event); return 0; } - - FREE(payload->fileurl); - payload->unlink_on_fail = 0; + _alpm_dload_payload_reset_for_retry(payload); } event.type = ALPM_EVENT_PKGDOWNLOAD_FAILED; -- 2.10.0

2 1

[pacman-dev] [PATCH 1/1] libalpm/signing: support EDDSA from gpgme 1.7.0
by Christian Hesse 02 Dec '16

02 Dec '16

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/signing.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 527e763..1feacff 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -356,6 +356,10 @@ static int key_search(alpm_handle_t *handle, const char *fpr, #if GPGME_VERSION_NUMBER >= 0x010500 case GPGME_PK_ECC: #endif +/* value added in gpgme 1.7.0 */ +#if GPGME_VERSION_NUMBER >= 0x010700 + case GPGME_PK_EDDSA: +#endif pgpkey->pubkey_algo = 'E'; break; } -- 2.10.2

2 1

[pacman-dev] Fwd: [arch-dev-public] Moving arduino into [community] important notes
by Allan McRae 28 Nov '16

28 Nov '16

Issue described on pacman-dev: The 2nd issue is when people try to upgrade from an older version of arduino that provided arduino-builder. It will fail to install as the new version says "oh, arduino-builder is already installed". It then tries to remove arduino and the arduino-builder dependency is not satisfied anymore. This only affects a small number of versions, but still raise up on AUR. I am not sure if this got fixed in pacman by now. -> To resolve this issue you need to remove arduino first and then reinstall it. >From what I can see, package A provides B, but in the next update, A and B are separate packages. Allan

2 2

[pacman-dev] Very slow, misbehaving Pacman that keeps changing its PID
by Allan McRae 21 Nov '16

21 Nov '16

Post on the Arch BBS: https://bbs.archlinux.org/viewtopic.php?id=219800 I have not looked at this in detail yet. I think that the ever changing PID is actually a gpg call from gpgme. A

1 0

[pacman-dev] [PATCH 0/6] Assorted makepkg cleanups
by Dave Reisner 16 Nov '16

16 Nov '16

Here's a bunch of patches I've had sitting on a branch for a while, plus a new one at the end which I thought would be a good idea after I found an instance of "{$pkgver}" in a PKGBUILD. These (and the other dload/curl patch) can be pulled from git://github.com/falconindy/pacman. Dave Reisner (6): makepkg.conf: add -g to default curl options makepkg: remove vestiges of global errexit makepkg: make run_function_safe more robust makepkg: fix quoting in calls to check_deps makepkg: fix quoting in calls to dependency checking makepkg: unset potentially architecture-specific vars etc/makepkg.conf.in | 6 +++--- scripts/makepkg.sh.in | 37 ++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) -- 2.10.2

2 7