August 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: do not create hg working directory on checkout
by Allan McRae 22 Aug '12

22 Aug '12

Creating the working directory can waste a lot of space. Fixes FS#31221. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 51d3971..21c660c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -477,7 +477,7 @@ download_hg() { if [[ ! -d "$dir" ]]; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" - if ! hg clone "$url" "$dir"; then + if ! hg clone -U "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 @@ -485,7 +485,7 @@ download_hg() { elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "hg" cd_safe "$dir" - if ! hg pull -u; then + if ! hg pull; then # only warn on failure to allow offline builds warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "hg" fi -- 1.7.12

1 0

[pacman-dev] [PATCH] pkgdelta: pass correct args to create_delta
by Dave Reisner 18 Aug '12

18 Aug '12

Somewhere in the arg parse refactoring, the args array went away and we simply stashed our remaining parameters as positionals. Fix this up so that pkgdelta doesn't mysteriously hang in read_pkginfo(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I probably broke this. scripts/pkgdelta.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 3d80261..08835ac 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -215,6 +215,6 @@ if ! type xdelta3 &>/dev/null; then exit 1 fi -create_xdelta "${args[@]}" +create_xdelta "$@" # vim: set ts=2 sw=2 noet: -- 1.7.11.5

1 0

[pacman-dev] [PATCH] Make alpm_pkg_find public
by Allan McRae 12 Aug '12

12 Aug '12

This function is particularly useful, so make it public. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 7 +++++++ lib/libalpm/deps.c | 12 ++++++------ lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 10 +++++----- lib/libalpm/sync.c | 20 ++++++++++---------- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index edddc31..ecdccff 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -67,7 +67,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package '%s'\n", pkgname); - if(_alpm_pkg_find(trans->add, pkgname)) { + if(alpm_pkg_find(trans->add, pkgname)) { RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5b4eb6d..e3808d3 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -698,6 +698,13 @@ alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); int alpm_pkg_load(alpm_handle_t *handle, const char *filename, int full, alpm_siglevel_t level, alpm_pkg_t **pkg); +/** Find a package in a list by name. + * @param haystack a list of alpm_pkg_t + * @param needle the package name + * @return a pointer to the package if found or NULL + */ +alpm_pkg_t *alpm_pkg_find(alpm_list_t *haystack, const char *needle); + /** Free a package. * @param pkg package pointer to free * @return 0 on success, -1 on error (pm_errno is set accordingly) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2a06bb0..27656bc 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -281,7 +281,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, for(i = pkglist; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkg_find(rem, pkg->name) || _alpm_pkg_find(upgrade, pkg->name)) { + if(alpm_pkg_find(rem, pkg->name) || alpm_pkg_find(upgrade, pkg->name)) { modified = alpm_list_add(modified, pkg); } else { dblist = alpm_list_add(dblist, pkg); @@ -495,7 +495,7 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, { alpm_list_t *i; - if(_alpm_pkg_find(targets, pkg->name)) { + if(alpm_pkg_find(targets, pkg->name)) { return 0; } @@ -517,7 +517,7 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, /* see if other packages need it */ for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { alpm_pkg_t *lpkg = i->data; - if(_alpm_dep_edge(lpkg, pkg) && !_alpm_pkg_find(targets, lpkg->name)) { + if(_alpm_dep_edge(lpkg, pkg) && !alpm_pkg_find(targets, lpkg->name)) { return 0; } } @@ -591,7 +591,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, for(i = dbs; i; i = i->next) { alpm_pkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); if(pkg && _alpm_depcmp_literal(pkg, dep) - && !_alpm_pkg_find(excluding, pkg->name)) { + && !alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { @@ -616,7 +616,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /* with hash != hash, we can even skip the strcmp() as we know they can't * possibly be the same string */ if(pkg->name_hash != dep->name_hash && _alpm_depcmp(pkg, dep) - && !_alpm_pkg_find(excluding, pkg->name)) { + && !alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(handle, pkg)) { int install = 0; if(prompt) { @@ -730,7 +730,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_list_t *deps = NULL; alpm_list_t *packages_copy; - if(_alpm_pkg_find(*packages, pkg->name) != NULL) { + if(alpm_pkg_find(*packages, pkg->name) != NULL) { return 0; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index f3e0b7f..853771f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -685,7 +685,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) /* Test for existence of a package in a alpm_list_t* * of alpm_pkg_t* */ -alpm_pkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) +alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) { alpm_list_t *lp; unsigned long needle_hash; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 313fe9d..a915bc3 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -140,7 +140,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg); -alpm_pkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle); int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg); #endif /* _ALPM_PACKAGE_H */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 80c847e..d1020a6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -68,7 +68,7 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) pkgname = pkg->name; - if(_alpm_pkg_find(trans->remove, pkgname)) { + if(alpm_pkg_find(trans->remove, pkgname)) { RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } @@ -100,7 +100,7 @@ static int remove_prepare_cascade(alpm_handle_t *handle, alpm_list_t *lp) alpm_pkg_t *info = _alpm_db_get_pkgfromcache(handle->db_local, miss->target); if(info) { alpm_pkg_t *copy; - if(!_alpm_pkg_find(trans->remove, info->name)) { + if(!alpm_pkg_find(trans->remove, info->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling %s in target list\n", info->name); if(_alpm_pkg_dup(info, &copy) == -1) { @@ -137,7 +137,7 @@ static void remove_prepare_keep_needed(alpm_handle_t *handle, alpm_list_t *lp) for(i = lp; i; i = i->next) { alpm_depmissing_t *miss = i->data; void *vpkg; - alpm_pkg_t *pkg = _alpm_pkg_find(trans->remove, miss->causingpkg); + alpm_pkg_t *pkg = alpm_pkg_find(trans->remove, miss->causingpkg); if(pkg == NULL) { continue; } @@ -171,11 +171,11 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * alpm_pkg_t *pkg = i->data; alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg); - if(optdeps && !_alpm_pkg_find(lp, pkg->name)) { + if(optdeps && !alpm_pkg_find(lp, pkg->name)) { alpm_list_t *j; for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; - if(_alpm_pkg_find(lp, optdep->name)) { + if(alpm_pkg_find(lp, optdep->name)) { EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep); } } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ca6b507..841e5d6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -159,7 +159,7 @@ static alpm_list_t *check_replacers(alpm_handle_t *handle, alpm_pkg_t *lpkg, /* If spkg is already in the target list, we append lpkg to spkg's * removes list */ - tpkg = _alpm_pkg_find(handle->trans->add, spkg->name); + tpkg = alpm_pkg_find(handle->trans->add, spkg->name); if(tpkg) { /* sanity check, multiple repos can contain spkg->name */ if(tpkg->origin_data.db != sdb) { @@ -204,7 +204,7 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { alpm_pkg_t *lpkg = i->data; - if(_alpm_pkg_find(trans->add, lpkg->name)) { + if(alpm_pkg_find(trans->add, lpkg->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; } @@ -257,7 +257,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, for(j = grp->packages; j; j = j->next) { alpm_pkg_t *pkg = j->data; - if(_alpm_pkg_find(ignorelist, pkg->name)) { + if(alpm_pkg_find(ignorelist, pkg->name)) { continue; } if(_alpm_pkg_should_ignore(db->handle, pkg)) { @@ -268,7 +268,7 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, if(!install) continue; } - if(!_alpm_pkg_find(pkgs, pkg->name)) { + if(!alpm_pkg_find(pkgs, pkg->name)) { pkgs = alpm_list_add(pkgs, pkg); } } @@ -448,7 +448,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Set DEPEND reason for pulled packages */ for(i = resolved; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(!_alpm_pkg_find(trans->add, pkg->name)) { + if(!alpm_pkg_find(trans->add, pkg->name)) { pkg->reason = ALPM_PKG_REASON_DEPEND; } } @@ -482,8 +482,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *rsync, *sync, *sync1, *sync2; /* have we already removed one of the conflicting targets? */ - sync1 = _alpm_pkg_find(trans->add, conflict->package1); - sync2 = _alpm_pkg_find(trans->add, conflict->package2); + sync1 = alpm_pkg_find(trans->add, conflict->package1); + sync2 = alpm_pkg_find(trans->add, conflict->package2); if(!sync1 || !sync2) { continue; } @@ -545,7 +545,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) int found = 0; for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; - if(_alpm_pkg_find(spkg->removes, conflict->package2)) { + if(alpm_pkg_find(spkg->removes, conflict->package2)) { found = 1; } } @@ -556,7 +556,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) _alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", conflict->package1, conflict->package2); - alpm_pkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1); + alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1); alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2); int doremove = 0; QUESTION(handle, ALPM_QUESTION_CONFLICT_PKG, conflict->package1, @@ -590,7 +590,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { alpm_pkg_t *rpkg = j->data; - if(!_alpm_pkg_find(trans->remove, rpkg->name)) { + if(!alpm_pkg_find(trans->remove, rpkg->name)) { alpm_pkg_t *copy; _alpm_log(handle, ALPM_LOG_DEBUG, "adding '%s' to remove list\n", rpkg->name); if(_alpm_pkg_dup(rpkg, &copy) == -1) { -- 1.7.11.4

2 2

[pacman-dev] [PATCH] Remove incorrect documentation for unlink_file
by Allan McRae 12 Aug '12

12 Aug '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d1020a6..dafbe28 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -302,10 +302,6 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, /** * @brief Unlink a package file, backing it up if necessary. * - * @note Helper function for iterating through a package's file and deleting - * them. - * @note Used by _alpm_remove_commit. - * * @param handle the context handle * @param oldpkg the package being removed * @param newpkg the package replacing \a oldpkg -- 1.7.11.4

1 1

[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