- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 2/2] makepkg: check if $dir is a local clone of the right git repo
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg does not check if $dir is a local clone of the right repo. For example, git fetch would be run even if $dir is not a local bare clone of a git repo in present in source(), but a subdir of a checked-out one. That means makepkg can potentially fetch from a completely unrelated remote and update completely unrelated dirs/files. This patch adds a check to make sure we are fetching from the right remote. Signed-off-by: Mohammad Alsaleh <msal(a)i2pmail.org> --- scripts/makepkg.sh.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6c0e821..7ec523c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -404,8 +404,14 @@ download_git() { exit 1 fi elif (( ! HOLDVER )); then - msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" cd_safe "$dir" + # Make sure we are fetching the right repo + 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 + fi + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" -- 1.7.11.4

2 1

[pacman-dev] [PATCH 1/2] makepkg: git clone instead of git fetch if $dir exists but empty
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg would only check if $dir exists as an indication that a local clone exists. And if $dir does exist, makepkg will run git fetch inside it unconditionally. After applying this patch, makepkg will check if the existent $dir is empty. And if it is, it will be used to store a local clone. Signed-off-by: Mohammad Alsaleh <msal(a)i2pmail.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 270f988..6c0e821 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -396,7 +396,7 @@ download_git() { url=${url##*git+} url=${url%%#*} - if [[ ! -d "$dir" ]]; then + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" -- 1.7.11.4

2 1

[pacman-dev] [PATCH] Add pactest for "Optional for" output
by Allan McRae 12 Aug '12

12 Aug '12

From: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/query012.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 test/pacman/tests/query012.py diff --git a/test/pacman/tests/query012.py b/test/pacman/tests/query012.py new file mode 100644 index 0000000..cdb7120 --- /dev/null +++ b/test/pacman/tests/query012.py @@ -0,0 +1,13 @@ +self.description = "Query info on a package (reverse optdeps)" + +pkg = pmpkg("dummy", "1.0-2") +pkg.optdepends = ["dep: for foobar"] +self.addpkg2db("local", pkg) + +dep = pmpkg("dep") +self.addpkg2db("local", dep) + +self.args = "-Qi %s" % dep.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Optional For.*%s" % pkg.name) -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Add "Optional for" to package information output
by Allan McRae 12 Aug '12

12 Aug '12

Much like packages that require a give package are displayed in the "Required by" field of its information output, alos display packages that optionally require the package. Inspired-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Example output: > ./src/pacman/pacman -Qi tk Name : tk ... Required By : None Optional For : git python python2 r lib/libalpm/alpm.h | 8 ++++++++ lib/libalpm/package.c | 34 +++++++++++++++++++++++++++------- src/pacman/package.c | 4 +++- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index f8928b9..5b4eb6d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -721,6 +721,14 @@ int alpm_pkg_vercmp(const char *a, const char *b); */ alpm_list_t *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg); +/** Computes the list of packages optionally requiring a given package. + * The return value of this function is a newly allocated + * list of package names (char*), it should be freed by the caller. + * @param pkg a package + * @return the list of packages optionally requiring pkg + */ +alpm_list_t *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg); + /** @name Package Property Accessors * Any pointer returned by these functions points to internal structures * allocated by libalpm. They should not be freed nor modified in any diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4887e21..f3e0b7f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -389,7 +389,8 @@ int SYMEXPORT alpm_pkg_has_scriptlet(alpm_pkg_t *pkg) return pkg->ops->has_scriptlet(pkg); } -static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) +static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs, + int optional) { const alpm_list_t *i; pkg->handle->pm_errno = 0; @@ -397,7 +398,14 @@ static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { alpm_pkg_t *cachepkg = i->data; alpm_list_t *j; - for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { + + if(optional == 0) { + j = alpm_pkg_get_depends(cachepkg); + } else { + j = alpm_pkg_get_optdepends(cachepkg); + } + + for(; j; j = j->next) { if(_alpm_depcmp(pkg, j->data)) { const char *cachepkgname = cachepkg->name; if(alpm_list_find_str(*reqs, cachepkgname) == NULL) { @@ -408,8 +416,7 @@ static void find_requiredby(alpm_pkg_t *pkg, alpm_db_t *db, alpm_list_t **reqs) } } -/** Compute the packages requiring a given package. */ -alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) +static alpm_list_t *compute_requiredby(alpm_pkg_t *pkg, int optional) { const alpm_list_t *i; alpm_list_t *reqs = NULL; @@ -420,17 +427,17 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) if(pkg->origin == ALPM_PKG_FROM_FILE) { /* The sane option; search locally for things that require this. */ - find_requiredby(pkg, pkg->handle->db_local, &reqs); + find_requiredby(pkg, pkg->handle->db_local, &reqs, optional); } else { /* We have a DB package. if it is a local package, then we should * only search the local DB; else search all known sync databases. */ db = pkg->origin_data.db; if(db->status & DB_STATUS_LOCAL) { - find_requiredby(pkg, db, &reqs); + find_requiredby(pkg, db, &reqs, optional); } else { for(i = pkg->handle->dbs_sync; i; i = i->next) { db = i->data; - find_requiredby(pkg, db, &reqs); + find_requiredby(pkg, db, &reqs, optional); } reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp); } @@ -438,6 +445,19 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) return reqs; } +/** Compute the packages requiring a given package. */ +alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(alpm_pkg_t *pkg) +{ + return compute_requiredby(pkg, 0); +} + +/** Compute the packages optionally requiring a given package. */ +alpm_list_t SYMEXPORT *alpm_pkg_compute_optionalfor(alpm_pkg_t *pkg) +{ + return compute_requiredby(pkg, 1); +} + + /** @} */ alpm_file_t *_alpm_file_copy(alpm_file_t *dest, diff --git a/src/pacman/package.c b/src/pacman/package.c index ce7de7f..a8f322c 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -89,7 +89,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) double size; char bdatestr[50] = "", idatestr[50] = ""; const char *label, *reason; - alpm_list_t *validation = NULL, *requiredby = NULL; + alpm_list_t *validation = NULL, *requiredby = NULL, *optionalfor = NULL; from = alpm_pkg_get_origin(pkg); @@ -137,6 +137,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) if(extra || from == ALPM_PKG_FROM_LOCALDB) { /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); + optionalfor = alpm_pkg_compute_optionalfor(pkg); } cols = getcols(fileno(stdout)); @@ -159,6 +160,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) if(extra || from == ALPM_PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby, cols); + list_display(_("Optional For :"), optionalfor, cols); } deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols); deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), cols); -- 1.7.11.4

1 0

[pacman-dev] [PATCH 2/2] makepkg: check if $dir is a local clone of the right git repo
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg does not check if $dir is a local clone of the right repo. For example, git fetch would be run even if $dir is not a local bare clone of a git repo in present in source(), but a subdir of a checked-out one. That means makepkg can potentially fetch from a completely unrelated remote and update completely unrelated dirs/files. This patch adds a check to make sure we are fetching from the right remote. Signed-off-by: Mohammad Alsaleh <msal(a)mail.i2p> --- scripts/makepkg.sh.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6c0e821..7ec523c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -404,8 +404,14 @@ download_git() { exit 1 fi elif (( ! HOLDVER )); then - msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" cd_safe "$dir" + # Make sure we are fetching the right repo + 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 + fi + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" -- 1.7.11.4

1 0

[pacman-dev] [PATCH 1/2] makepkg: git clone instead of git fetch if $dir exists but empty
by Mohammad Alsaleh 12 Aug '12

12 Aug '12

Before this patch, makepkg would only check if $dir exists as an indication that a local clone exists. And if $dir does exist, makepkg will run git fetch inside it unconditionally. After applying this patch, makepkg will check if the existent $dir is empty. And if it is, it will be used to store a local clone. Signed-off-by: Mohammad Alsaleh <msal(a)mail.i2p> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 270f988..6c0e821 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -396,7 +396,7 @@ download_git() { url=${url##*git+} url=${url%%#*} - if [[ ! -d "$dir" ]]; then + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Avoid interger overflow when calculating remaining line length
by Allan McRae 11 Aug '12

11 Aug '12

When the len and cidx were changed to size_t in a8a1b093, it was possible to have an integer overflow when a line ended right at the edge of the terminal width. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Replicate with linux-lts-3.0.39-1 in the Arch Linux [core] repo and a terminal with 80 width. src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7f7f6a7..995308c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -296,7 +296,7 @@ void indentprint(const char *str, unsigned short indent, unsigned short cols) while(q < next) { len += wcwidth(*q++); } - if(len > (cols - cidx - 1)) { + if((len + 1) > (cols - cidx)) { /* wrap to a newline and reindent */ printf("\n%-*s", (int)indent, ""); cidx = indent; -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Add pactests for displaying optdep installation status
by Allan McRae 11 Aug '12

11 Aug '12

From: Benedikt Morbach <benedikt.morbach(a)googlemail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Extracted from https://mailman.archlinux.org/pipermail/pacman-dev/2011-November/014778.html test/pacman/tests/query010.py | 12 ++++++++++++ test/pacman/tests/query011.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 test/pacman/tests/query010.py create mode 100644 test/pacman/tests/query011.py diff --git a/test/pacman/tests/query010.py b/test/pacman/tests/query010.py new file mode 100644 index 0000000..76f82d9 --- /dev/null +++ b/test/pacman/tests/query010.py @@ -0,0 +1,12 @@ +self.description = "Query info on a package (optdep install status [uninstalled])" + +optstr = "dep: for foobar" + +pkg = pmpkg("dummy", "1.0-2") +pkg.optdepends = [optstr] +self.addpkg2db("local", pkg) + +self.args = "-Qi %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Optional Deps.*%s$" % optstr) diff --git a/test/pacman/tests/query011.py b/test/pacman/tests/query011.py new file mode 100644 index 0000000..f487fb2 --- /dev/null +++ b/test/pacman/tests/query011.py @@ -0,0 +1,15 @@ +self.description = "Query info on a package (optdep install status [installed])" + +optstr = "dep: for foobar" + +pkg = pmpkg("dummy", "1.0-2") +pkg.optdepends = [optstr] +self.addpkg2db("local", pkg) + +dep = pmpkg("dep") +self.addpkg2db("local", dep) + +self.args = "-Qi %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=^Optional Deps.*%s \[installed\]$" % optstr) -- 1.7.11.4

1 0

[pacman-dev] [PATCH] Display optdep install status in package query output
by Allan McRae 11 Aug '12

11 Aug '12

Indicate which optional dependencies are installed when viewing local package information (-Qi). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Example output: > ./src/pacman/pacman -Qi git Name : git ... Optional Deps : tk: gitk and git gui [installed] perl-libwww: git svn perl-term-readkey: git svn perl-mime-tools: git send-email perl-net-smtp-ssl: git send-email TLS support perl-authen-sasl: git send-email TLS support python2: various helper scripts [installed] subversion: git svn [installed] cvsps: git cvsimport src/pacman/package.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 77d58e1..3556a81 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -33,6 +33,7 @@ #include "package.h" #include "util.h" #include "conf.h" +#include "db.h" #define CLBUF_SIZE 4096 @@ -54,15 +55,22 @@ static void deplist_display(const char *title, /** Turn a optdepends list into a text list. * @param optdeps a list with items of type alpm_depend_t */ -static void optdeplist_display(const char *title, - alpm_list_t *optdeps, unsigned short cols) +static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) { alpm_list_t *i, *text = NULL; - for(i = optdeps; i; i = alpm_list_next(i)) { + for(i = alpm_pkg_get_optdepends(pkg); i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; - text = alpm_list_add(text, alpm_dep_compute_string(optdep)); + char *depstring = alpm_dep_compute_string(optdep); + if(alpm_pkg_get_origin(pkg) == ALPM_PKG_FROM_LOCALDB) { + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name)) { + const char *installed = _(" [installed]"); + depstring = realloc(depstring, strlen(depstring) + strlen(installed) + 1); + strcpy(depstring + strlen(depstring), installed); + } + } + text = alpm_list_add(text, depstring); } - list_display_linebreak(title, text, cols); + list_display_linebreak(_("Optional Deps :"), text, cols); FREELIST(text); } @@ -148,7 +156,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) list_display(_("Groups :"), alpm_pkg_get_groups(pkg), cols); deplist_display(_("Provides :"), alpm_pkg_get_provides(pkg), cols); deplist_display(_("Depends On :"), alpm_pkg_get_depends(pkg), cols); - optdeplist_display(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg), cols); + optdeplist_display(pkg, cols); + if(extra || from == ALPM_PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby, cols); } -- 1.7.11.4

1 1

[pacman-dev] [PATCH] Fix typo in documentation
by Allan McRae 11 Aug '12

11 Aug '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index fc869b1..77d58e1 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -52,7 +52,7 @@ static void deplist_display(const char *title, } /** Turn a optdepends list into a text list. - * @param optdeps a list with items of type alpm_optdepend_t + * @param optdeps a list with items of type alpm_depend_t */ static void optdeplist_display(const char *title, alpm_list_t *optdeps, unsigned short cols) -- 1.7.11.4

1 0