[pacman-dev] [PATCH 1/3] Fix whitespace in pacsort.c and pactree.c
Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- src/util/pacsort.c | 20 ++++++++++---------- src/util/pactree.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 50b9c65..7c551c2 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -26,7 +26,7 @@ #include <alpm.h> -#define DELIM ' ' +#define DELIM ' ' struct buffer_t { char *mem; @@ -52,21 +52,21 @@ static struct options_t { /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..2cba1b0 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -125,21 +125,21 @@ const char *configfile = CONFFILE; /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif @@ -362,7 +362,7 @@ static void print_text(const char *pkg, const char *provision, /* print tip */ if(!pkg && provision) { - printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, + printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, provision, color->branch1, color->off); } else if(provision && strcmp(pkg, provision) != 0) { printf("%s%s%s%s%s %s%s%s\n", tip, color->leaf1, pkg, -- 1.8.3.3
Replace spaces with tabs in one instance. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- scripts/makepkg-template.pl.in | 2 +- scripts/makepkg.sh.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 567514e..03dd6b8 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -185,7 +185,7 @@ sub usage { sub version { my ($exitstatus) = @_; printf "makepkg-template (pacman) %s\n", '@PACKAGE_VERSION@'; - print gettext( + print gettext( 'Copyright (c) 2013 Pacman Development Team <pacman-dev@archlinux.org>.'."\n". 'This is free software; see the source for copying conditions.'."\n". 'There is NO WARRANTY, to the extent permitted by law.'."\n"); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a39157..dfcb859 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -548,7 +548,7 @@ download_git() { elif (( ! HOLDVER )); then cd_safe "$dir" # Make sure we are fetching the right repo - if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then + if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then error "$(gettext "%s is not a clone of %s")" "$dir" "$url" plain "$(gettext "Aborting...")" exit 1 @@ -1606,10 +1606,10 @@ tidy_install() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then warning "$(gettext "Package contains reference to %s")" "\$pkgdir" fi @@ -2904,7 +2904,7 @@ msg "$(gettext "Making package: %s")" "$pkgbase $fullver ($(date))" # if we are creating a source-only package, go no further if (( SOURCEONLY )); then if [[ -f $SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT} ]] \ - && (( ! FORCE )); then + && (( ! FORCE )); then error "$(gettext "A source package has already been built. (use %s to overwrite)")" "-f" exit 1 fi -- 1.8.3.3
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "cleanupdelta" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -87,9 +85,10 @@ static void checkdbs(alpm_list_t *dbnames) static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "cleanupdelta (pacman) v" PACKAGE_VERSION "\n\n" + "Returns a list of unused delta in a given sync database.\n\n" + "Usage: cleanupdelta [options]\n\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 7c551c2..687e558 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -343,9 +343,10 @@ static char escape_char(const char *string) static void usage(void) { - fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" + fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" - " -f, --files assume inputs are filepaths of packages\n" + " -f, --files assume inputs are file paths of packages\n" " -h, --help display this help message\n" " -k, --key <index> sort input starting on specified column\n" " -r, --reverse sort in reverse order (default: oldest to newest)\n" diff --git a/src/util/pactree.c b/src/util/pactree.c index 2cba1b0..cd8c360 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -310,9 +310,10 @@ static int parse_options(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "pactree v" PACKAGE_VERSION "\n" + fprintf(stderr, "pactree (pacman) v" PACKAGE_VERSION "\n\n" + "A simple dependency tree viewer.\n\n" "Usage: pactree [options] PACKAGE\n\n" - " -a, --ascii use ascii characters for tree formatting\n" + " -a, --ascii use ASCII characters for tree formatting\n" " -b, --dbpath <path> set an alternate database location\n" " -c, --color colorize output\n" " -d, --depth <#> limit the depth of recursion\n" @@ -320,7 +321,7 @@ static void usage(void) " -h, --help display this help message\n" " -l, --linear enable linear output\n" " -r, --reverse show reverse dependencies\n" - " -s, --sync search sync DBs instead of local\n" + " -s, --sync search sync databases instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" " --config <path> set an alternate configuration file\n"); } diff --git a/src/util/testdb.c b/src/util/testdb.c index 0ca7ffc..3d341b3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -27,8 +27,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "testdb" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -244,11 +242,11 @@ cleanup: static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] : check the local database\n", BASENAME); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "testdb (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman local database for validity.\n\n" + "Usage: testdb [options]\n\n" + " -b <pacman db> : check the local database\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 10b2f2c..d1b75ac 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -22,8 +22,6 @@ #include <alpm.h> -#define BASENAME "testpkg" - __attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { @@ -47,7 +45,9 @@ int main(int argc, char *argv[]) const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; if(argc != 2) { - fprintf(stderr, "usage: %s <package file>\n", BASENAME); + fprintf(stderr, "testpkg (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman package for validity.\n\n" + "Usage: testpkg <package file>\n"); return 1; } diff --git a/src/util/vercmp.c b/src/util/vercmp.c index f4356fb..41a4f8e 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -1,5 +1,6 @@ /* - * vercmp.c + * vercmp.c - Compare package version numbers using pacman's version + * comparison logic * * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org> * Copyright (c) 2002-2005 by Judd Vinet <jvinet@zeroflux.org> @@ -22,19 +23,19 @@ #include <stdio.h> /* printf */ #include <string.h> -#define BASENAME "vercmp" - /* forward declaration, comes from version.o in libalpm source that is linked * in directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); static void usage(void) { - fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); - fprintf(stderr, "output values:\n"); - fprintf(stderr, " < 0 : if ver1 < ver2\n"); - fprintf(stderr, " 0 : if ver1 == ver2\n"); - fprintf(stderr, " > 0 : if ver1 > ver2\n"); + fprintf(stderr, "vercmp (pacman) v" PACKAGE_VERSION "\n\n" + "Compare package version numbers using pacman's version comparison logic.\n\n" + "Usage: vercmp <ver1> <ver2>\n\n" + "Output values:\n" + " < 0 : if ver1 < ver2\n" + " 0 : if ver1 == ver2\n" + " > 0 : if ver1 > ver2\n"); } int main(int argc, char *argv[]) -- 1.8.3.3
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
On Tue, Jul 23, 2013 at 3:27 AM, Allan McRae <allan@archlinux.org> wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
In case it matters, I removed the BASENAME define for testdb, testpkg, and vercmp too. Jason
On Tue, Jul 23, 2013 at 3:35 AM, Jason St. John <jstjohn@purdue.edu> wrote:
On Tue, Jul 23, 2013 at 3:27 AM, Allan McRae <allan@archlinux.org> wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
In case it matters, I removed the BASENAME define for testdb, testpkg, and vercmp too.
Jason
Sorry for a late response. 'pacman -h' still doesn't tell you what does it do. $ testpkg usage: testpkg <package file> $ testpkg -h Cannot find the given file It would be nice if ' testpkg -h' printed help. If I'm reading testpkg.c patch right, it doesn't fix this. What about makepkg and other scripts? They're still missing a description of what they do from 'foo -h': $ head -3 /usr/bin/makepkg #!/usr/bin/bash # # makepkg - make packages compatible for use with pacman $ head -3 /usr/bin/paclog-pkglist #!/usr/bin/bash # # paclog-pkglist - Parse a log file into a list of currently installed packages $ head -3 /usr/bin/pacman-db-upgrade #!/usr/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format
On 23/07/13 11:27, Allan McRae wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
Ping on this question. (and lesson for everyone - the more minimal your changes in a patch, the more chance it gets accepted quickly...)
On Tue, Aug 20, 2013 at 9:15 PM, Allan McRae <allan@archlinux.org> wrote:
On 23/07/13 11:27, Allan McRae wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
Ping on this question.
(and lesson for everyone - the more minimal your changes in a patch, the more chance it gets accepted quickly...)
Should I resubmit this with the BASENAME change done in a separate patch? Or should I resubmit with each file done in a separate patch? Jason
On 03/09/13 06:52, Jason St. John wrote:
On Tue, Aug 20, 2013 at 9:15 PM, Allan McRae <allan@archlinux.org> wrote:
On 23/07/13 11:27, Allan McRae wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
Ping on this question.
(and lesson for everyone - the more minimal your changes in a patch, the more chance it gets accepted quickly...)
Should I resubmit this with the BASENAME change done in a separate patch? Or should I resubmit with each file done in a separate patch?
No need. I believe I got the OK for this on IRC. I will pull this patch next time I do some pacman work. Allan
On 03/09/13 07:48, Allan McRae wrote:
On 03/09/13 06:52, Jason St. John wrote:
On Tue, Aug 20, 2013 at 9:15 PM, Allan McRae <allan@archlinux.org> wrote:
On 23/07/13 11:27, Allan McRae wrote:
On 22/07/13 11:09, Jason St. John wrote:
Unify the formatting of the --help switch for pacman utils. All of the pacman utils will now output help text using the following format:
util-name (pacman) v<pacman version>
one line description of util's purpose
Usage: util-name [options]
-b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message
Reported-by: Karol Błażewicz <karol.blazewicz@gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- This commit should address the issues raised by Karol Błażewicz in this mail: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html
Looks fine. Query for everyone below:
src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h>
-#define BASENAME "cleanupdelta" -
It looks like we defined this in dea9b3bc when we stopped using basename to output the program name. Given it is only ever used in one place, is there any reason to keep it?
Ping on this question.
(and lesson for everyone - the more minimal your changes in a patch, the more chance it gets accepted quickly...)
Should I resubmit this with the BASENAME change done in a separate patch? Or should I resubmit with each file done in a separate patch?
No need. I believe I got the OK for this on IRC. I will pull this patch next time I do some pacman work.
But it would help if you could resend the patch rebased on master. I am having difficulty applying it and do not have the time to fix it myself. A
On Tue, Sep 3, 2013 at 1:55 AM, Allan McRae <allan@archlinux.org> wrote:
On 03/09/13 07:48, Allan McRae wrote:
On 03/09/13 06:52, Jason St. John wrote:
On Tue, Aug 20, 2013 at 9:15 PM, Allan McRae <allan@archlinux.org> wrote:
Ping on this question.
(and lesson for everyone - the more minimal your changes in a patch, the more chance it gets accepted quickly...)
Should I resubmit this with the BASENAME change done in a separate patch? Or should I resubmit with each file done in a separate patch?
No need. I believe I got the OK for this on IRC. I will pull this patch next time I do some pacman work.
But it would help if you could resend the patch rebased on master. I am having difficulty applying it and do not have the time to fix it myself.
A
Sure. I resubmitted it here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-September/017780.htm... Jason
participants (3)
-
Allan McRae
-
Jason St. John
-
Karol Blazewicz