- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove find_replacements().
by Nagy Gabor 13 Apr '09

13 Apr '09

From bf937acf544b836fd322a94cbf9e41bc7f609284 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 13 Apr 2009 15:08:38 +0200 Subject: [PATCH] Remove find_replacements(). "Foo replaces bar" simply means that "foo is a new version of bar". So this patch refactors the code to use this "rule". _alpm_sync_sysupgrade now does the following for each local package [bar] (pseudo-code): for db in syncdbs { if(db contains bar) {check if db/bar is an upgrade; break;} replacers = find(bar replacers in db); if(replacers!=NULL) {ask_user;break;} } Note: 1. Replacers are grouped per repo. 2. If repo1/foo and repo2/foo both replaces bar, only repo1/foo is considered (if repo1 stands before repo2 in pacman.conf). FS#11737 fixed. 3. It can happen that pacman doesn't consider any replacer, if pacman found a literal "earlier", so sync132.py modified accordingly (btw, that situation should not appear irl). The new code doesn't use sync_newversion(), so I removed the "local is newer than repo" message, which was annoying with -Qu and pacman new version check. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 200 ++++++++++++++++++--------------------------- pactest/tests/sync132.py | 4 +- 2 files changed, 82 insertions(+), 122 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1dbd93d..039fd27 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -48,86 +48,15 @@ #include "dload.h" #include "delta.h" -/* Find recommended replacements for packages during a sync. - */ -static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) -{ - alpm_list_t *i, *j, *k; /* wow */ - - ALPM_LOG_FUNC; - - /* check for "recommended" package replacements */ - _alpm_log(PM_LOG_DEBUG, "checking for package replacements\n"); - for(i = dbs_sync; i; i = i->next) { - pmdb_t *db = i->data; - - /* for each db, check each package's REPLACES list */ - for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { - pmpkg_t *spkg = j->data; - - for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { - const char *replacement = k->data; - - pmpkg_t *lpkg = _alpm_db_get_pkgfromcache(db_local, replacement); - if(!lpkg) { - continue; - } - - _alpm_log(PM_LOG_DEBUG, "checking replacement '%s' for package '%s'\n", - replacement, spkg->name); - /* ignore if EITHER the local or replacement package are to be ignored */ - if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"), - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } else { - int doreplace = 0; - QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); - if(!doreplace) { - continue; - } - - /* if confirmed, add this to the 'final' list, designating 'lpkg' as - * the package to replace. - */ - - /* check if spkg->name is already in the packages list. */ - /* TODO: same package name doesn't mean same package */ - pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg)); - if(tpkg) { - /* found it -- just append to the removes list */ - tpkg->removes = alpm_list_add(tpkg->removes, lpkg); - /* check the to-be-replaced package's reason field */ - if(alpm_pkg_get_reason(lpkg) == PM_PKG_REASON_EXPLICIT) { - tpkg->reason = PM_PKG_REASON_EXPLICIT; - } - } else { - /* none found -- enter pkg into the final sync list */ - /* copy over reason */ - spkg->reason = alpm_pkg_get_reason(lpkg); - spkg->removes = alpm_list_add(NULL, lpkg); - _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - trans->packages = alpm_list_add(trans->packages, spkg); - } - _alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n", - alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg), - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - } - } - } - } - return(0); -} - /** Check for new version of pkg in sync repos * (only the first occurrence is considered in sync) */ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) { + ASSERT(pkg != NULL, return(NULL)); + alpm_list_t *i; pmpkg_t *spkg = NULL; - int cmp; for(i = dbs_sync; !spkg && i; i = i->next) { spkg = _alpm_db_get_pkgfromcache(i->data, alpm_pkg_get_name(pkg)); @@ -140,77 +69,108 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) } /* compare versions and see if spkg is an upgrade */ - cmp = _alpm_pkg_compare_versions(spkg, pkg); - if(cmp > 0) { + if(_alpm_pkg_compare_versions(spkg, pkg) > 0) { _alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), alpm_pkg_get_version(spkg)); return(spkg); } - if (cmp < 0) { - pmdb_t *db = spkg->origin_data.db; - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg), - alpm_db_get_name(db), alpm_pkg_get_version(spkg)); - } + /* spkg is not an upgrade */ return(NULL); } int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { - alpm_list_t *i, *j, *replaced = NULL; + alpm_list_t *i, *j, *k; ALPM_LOG_FUNC; - /* check for "recommended" package replacements */ - if(find_replacements(trans, db_local, dbs_sync)) { - return(-1); - } - - /* compute the to-be-replaced packages for efficiency */ - for(i = trans->packages; i; i = i->next) { - pmpkg_t *spkg = i->data; - for(j = spkg->removes; j; j = j->next) { - replaced = alpm_list_add(replaced, j->data); - } - } - - /* for all not-replaced local package we check for upgrade */ _alpm_log(PM_LOG_DEBUG, "checking for package upgrades\n"); for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) { - pmpkg_t *local = i->data; + pmpkg_t *lpkg = i->data; - if(_alpm_pkg_find(replaced, alpm_pkg_get_name(local))) { - _alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n", - alpm_pkg_get_name(local)); + if(_alpm_pkg_find(trans->packages, lpkg->name)) { + _alpm_log(PM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; } - pmpkg_t *spkg = alpm_sync_newversion(local, dbs_sync); - if(spkg) { - /* we found a new version */ - /* skip packages in IgnorePkg or in IgnoreGroup */ - if(_alpm_pkg_should_ignore(spkg)) { - _alpm_log(PM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local), - alpm_pkg_get_version(spkg)); - continue; - } + /* Search for literal then replacers in each sync database. + * If found, don't check other databases */ + for(j = dbs_sync; j; j = j->next) { + pmdb_t *sdb = j->data; + /* Check sdb */ + pmpkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); + if(spkg) { /* 1. literal was found in sdb */ + int cmp = _alpm_pkg_compare_versions(spkg, lpkg); + if(cmp > 0) { + _alpm_log(PM_LOG_DEBUG, "new version of '%s' found (%s => %s)\n", + lpkg->name, lpkg->version, spkg->version); + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("%s: ignoring package upgrade (%s => %s)\n"), + lpkg->name, lpkg->version, spkg->version); + } else { + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + spkg->name, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } else if(cmp < 0) { + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"), + lpkg->name, lpkg->version, sdb->treename, spkg->version); + } + break; /* jump to next local package */ + } else { /* 2. search for replacers in sdb */ + int found = 0; + for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { + spkg = k->data; + if(alpm_list_find_str(alpm_pkg_get_replaces(spkg), lpkg->name)) { + found = 1; + /* check IgnorePkg/IgnoreGroup */ + if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) { + _alpm_log(PM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), + lpkg->name, lpkg->version, spkg->name, spkg->version); + continue; + } - /* add the upgrade package to the target list */ - if(_alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg))) { - /* avoid duplicated targets */ - continue; + int doreplace = 0; + QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, sdb->treename, &doreplace); + if(!doreplace) { + continue; + } + + /* If spkg is already in the target list, we append lpkg to spkg's removes list */ + pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, spkg->name); + if(tpkg) { + /* sanity check, multiple repos can contain spkg->name */ + if(tpkg->origin_data.db != sdb) { + _alpm_log(PM_LOG_WARNING, _("cannot replace %s by %s\n"), + lpkg->name, spkg->name); + continue; + } + _alpm_log(PM_LOG_DEBUG, "appending %s to the removes list of %s", + lpkg->name, tpkg->name); + tpkg->removes = alpm_list_add(tpkg->removes, lpkg); + /* check the to-be-replaced package's reason field */ + if(alpm_pkg_get_reason(lpkg) == PM_PKG_REASON_EXPLICIT) { + tpkg->reason = PM_PKG_REASON_EXPLICIT; + } + } else { /* add spkg to the target list */ + /* copy over reason */ + spkg->reason = alpm_pkg_get_reason(lpkg); + spkg->removes = alpm_list_add(NULL, lpkg); + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + spkg->name, spkg->version); + trans->packages = alpm_list_add(trans->packages, spkg); + } + } + } + if(found) { + break; /* jump to next local package */ + } } - _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); - /* we don't set any reason here, - it will be calculated from local package in add_commit */ - trans->packages = alpm_list_add(trans->packages, spkg); } } - alpm_list_free(replaced); return(0); } diff --git a/pactest/tests/sync132.py b/pactest/tests/sync132.py index 5e85727..2d671c7 100644 --- a/pactest/tests/sync132.py +++ b/pactest/tests/sync132.py @@ -14,5 +14,5 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") -- 1.6.0.3

1 1

[pacman-dev] [PATCH] makepkg: Fix integrity check when files are missing.
by Loui Chang 13 Apr '09

13 Apr '09

The index in the for loop wasn't being incremented, so if the first file wasn't found, the second file would be compared to the first checksum, rather than the second. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- scripts/makepkg.sh.in | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 349d0e0..9ff70f6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -573,6 +573,7 @@ check_checksums() { local idx=0 local file for file in "${source[@]}"; do + local found=1 file="$(get_filename "$file")" echo -n " $file ... " >&2 @@ -580,19 +581,21 @@ check_checksums() { if [ ! -f "$file" ] ; then echo "$(gettext "NOT FOUND")" >&2 errors=1 - continue + found=0 else file="$SRCDEST/$file" fi fi - local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')" - local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" - if [ "$expectedsum" = "$realsum" ]; then - echo "$(gettext "Passed")" >&2 - else - echo "$(gettext "FAILED")" >&2 - errors=1 + if [ $found -gt 0 ] ; then + local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')" + local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" + if [ "$expectedsum" = "$realsum" ]; then + echo "$(gettext "Passed")" >&2 + else + echo "$(gettext "FAILED")" >&2 + errors=1 + fi fi idx=$((idx + 1)) -- 1.6.2.2

2 4

[pacman-dev] Copyright notices in pacman code
by Allan McRae 12 Apr '09

12 Apr '09

Hi all, I was looking through makepkg for areas that need tidied before the upcoming(!) release when I noticed the copyright notice in the version output is is "2002-2007 Judd Vinet". (Note it is 2002-2008 in the header.) So I went to add Dan here for the newer years (being the current project lead - that way I can blame him when I break something...). Then I did a "grep -R Copyright *" and noticed there is a lot that has been altered that has not had copyrights updated. I don't know what the best practice with this should be. Should someone make a big patch bumps the copyright years and adds new lines as necessary? BTW, this is my favourite line: lib/libalpm/po/it.po:# Copyright (C) 2007 THE libalpm'S COPYRIGHT HOLDER Allan

4 5

[pacman-dev] Some comments on Bryan patches (bugs)
by Nagy Gabor 12 Apr '09

12 Apr '09

Hi! I know that I speak too late, but I haven't time/motivation to review this patch nowadays. 1. See alpm/sync.c/sync_prepare(). When user decides to remove unresolvable targets from the list, our code doesn't remove any targets from target->packages, just adds the pulled dependencies. The actual removal is done in the sortbydeps part (sortbydeps is called with list param!). This works, but it is hard to understand (imho), and it is a memleak: some pmsyncpkg_t structs magically disappeared. 2. Behaviour change (this pactest now fails) --- sync993.py --- self.description = "Choose a dependency satisfier (target-list vs. database)" sp1 = pmpkg("pkg1") sp1.depends = ["dep"] sp2 = pmpkg("pkg2") sp2.provides = ["dep"] sp3 = pmpkg("pkg3") sp3.provides = ["dep"] for p in sp1, sp2, sp3: self.addpkg2db("sync", p) self.args = "-S pkg1 pkg3" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") self.addrule("PKG_EXIST=pkg3") ------------------ If you define conflict between pkg2 and pkg3, pacman will refuse to commit the transation. Before this patch, pacman always chose from target list. Bye

3 12

[pacman-dev] [PATCH] Remove pmsyncpkg_t
by Nagy Gabor 12 Apr '09

12 Apr '09

Hi! Since the patch is quite long and it depends on my working branch, I don't send it here directly. It can be found in my repo (it is a new branch): http://repo.or.cz/w/pacman-ng.git ---quote--- Remove pmsyncpkg_t pmsyncpkg_t data sructure was removed: 1. pmpkg_t.reason is used instead of pmsyncpkg_t.newreason. (The target packages come from sync repos, so we can use this field without any problems. Upgrade transaction also uses this field to store this info.) 2. pmsyncpkg_t.removes was moved to pmpkg_t.removes. This step requires careful programming, because we don't duplicate packages when we add them to trans->packages. So we modify sync pkgcache when we add this transaction-only info to our package. Hence it is important to free this list when we remove any package from the target list (remove_unresolvable, remove_conflicts, trans_free), otherwise this could confuse the new sync transactions (with non-pacman GUI). Overall, our code became ~100 line shorter, and we can call our helper functions directly on trans->packages in sync.c, we don't need to maintain parallel package lists. ---------- I simply merged pmsyncpkg_t to pmpkg_t, so the code became notable cleaner(?) and shorter, but I am not very satisfied, see the commit message. Bye

2 2

[pacman-dev] bash scripts errexit and nounset options
by Xavier 12 Apr '09

12 Apr '09

I found this page while implementing the locking system for repo-add, I stole some code from it : http://www.davidpashley.com/articles/writing-robust-shell-scripts.html It recommends using set -u and set -e, these both seem like a good idea to me. Should we try to be consistent using these options in all the bash scripts in pacman repo? Several already use set -e, but not all of them. And none seem to use set -u. While I find these two options useful, I wonder if it isn't a bad idea to introduce them now, as it could cause more harm than good. I guess that ideally, they would have been set from the beginning. Adding them now could add some non obvious problems to code that worked fine. Anyway, if we agree these flags are indeed useful, they could at least be considered when adding new scripts.

3 6

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-142-gdb3e166
by dan＠archlinux.org 11 Apr '09

11 Apr '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via db3e166503386b4f9e456017fd56d8bce84528fe (commit) via d70465decc617412db0670c8169ec22421c8e3d1 (commit) from 4b78852f7e78ec605be0a382ddc78afe33251d78 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit db3e166503386b4f9e456017fd56d8bce84528fe Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Mon Mar 9 09:56:13 2009 +1300 Look in target-list first to resolve dependencies This fixes a bug introduced by my previous changes which changes the behavior of IgnorePkg/IgnoreGroup to allow the user to remove unresolvable packages from the transaction. The bug is that the target-list was no longer being consulted first to resolve dependencies, which means that if two packages in the sync database satisfied a dependency, and the user explicitly requested one of those two packages in the sync, the other package was still being pulled in. A new test was added, sync993.py, to verify the desired behavior. Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d70465decc617412db0670c8169ec22421c8e3d1 Author: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Date: Mon Mar 9 10:05:10 2009 +1300 Remove duplicates from the unresolvable list before prompting user Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/deps.c | 18 +++++++++++------- lib/libalpm/deps.h | 3 ++- lib/libalpm/sync.c | 8 ++++++-- pactest/tests/sync993.py | 20 ++++++++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 pactest/tests/sync993.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-140-g4b78852
by dan＠archlinux.org 11 Apr '09

11 Apr '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 4b78852f7e78ec605be0a382ddc78afe33251d78 (commit) via aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d (commit) via 391952600d30bf7c28c5403c5c9e220d345ffe87 (commit) via 634304feae6574d42e069a6718621cf2852f08ab (commit) via 56fd24ecf8b75904444f548488fbe96185cf2492 (commit) via 77efd512165ca2066dc6547bda52082f8bd11db2 (commit) via 93ca155b48a29685914ffa10b11be42ef5d4734a (commit) via 0c614c181efec31ea8d3948745e5746b642cb10c (commit) via 91d43ba4b44e0827c6d9b66c70485672953f5a6d (commit) via 59b4725bbb881140fea47dd2d1b09cef37e8a9dc (commit) via a556bc57fccf9b35f9b2eca08ddae595c3a75592 (commit) via bbcf96230ad16ad91f5ab8cb93c05fd15136d3e4 (commit) via 89685bdb2918c59a109cba2199ab25bc1bcfa784 (commit) via 994804f20e51ea6dbbb236b919846a420b2d2369 (commit) via f8bb69c1d22473a3a82c6bab27799e3cada56a0a (commit) via 9fa18d9a4b4ce5217842c71d8a45676e3fb9d3f4 (commit) via c8beffa7904abe7e0ad01fed6113acf449df15cd (commit) from 101c16b3eb8048dffd1c6c4438e84b759d2e2aff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b78852f7e78ec605be0a382ddc78afe33251d78 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 14:13:03 2009 -0500 const-ify endswith() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aefb4e0fa54ad5b4140d6991f389b5a6fb4ead6d Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Mar 7 19:44:34 2009 +0100 Remove pmsyncpkg_t pmsyncpkg_t data sructure was removed: 1. pmpkg_t.reason is used instead of pmsyncpkg_t.newreason. (The target packages come from sync repos, so we can use this field without any problems. Upgrade transaction also uses this field to store this info.) 2. pmsyncpkg_t.removes was moved to pmpkg_t.removes. This step requires careful programming, because we don't duplicate packages when we add them to trans->packages. So we modify sync pkgcache when we add this transaction-only info to our package. Hence it is important to free this list when we remove any package from the target list (remove_unresolvable, remove_conflicts, trans_free), otherwise this could confuse the new sync transactions (with non-pacman GUI). Overall, our code became ~100 line shorter, and we can call our helper functions directly on trans->packages in sync.c, we don't need to maintain parallel package lists. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 391952600d30bf7c28c5403c5c9e220d345ffe87 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jan 2 17:43:05 2009 +0100 Fix for trans001.py (FS#9088) From now on _alpm_db_find_fileconflicts() works with upgrade and remove target lists (like checkdeps), which makes it transaction independent (we still need a trans param because of the progressbar). This is a small step towards the universal transaction. So we call this function directly from sync.c before commiting the remove transaction. This is much safer, but we can get false fileconflict error alarms in some tricky cases ("symlinks puzzle" etc). The patch on find_fileconflict looks complex, but it is mainly an "indent-patch", the new code-part can be found after the /* check remove list ... */ comment, and I modified something around the "file has changed hand" case (see comment modifications in the code). Unfortunately sync.c became more ugly, because we have to create 2 parallel internal transactions: to avoid duplicated work, upgrade transaction is used to load package data (filelists). This problem will disappear, when we finally get rid of internal transactions. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 634304feae6574d42e069a6718621cf2852f08ab Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Mar 7 16:25:29 2009 +0100 Free *data list when user removes unresolvable packages Resolvedeps reports error when it cannot resolve some dependencies, puts them into the *data list, and set pm_errno. If user removes the unresolvable packages from the target list, we have no error anymore, so from now on we free *data list (we eliminate a memleak) and unset pm_errno. (Additionally I removed two needless lines from the code, unresolvable list is always freed in cleanup.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 56fd24ecf8b75904444f548488fbe96185cf2492 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Mar 4 20:34:06 2009 +0100 Print warning in _alpm_resolvedep() if a satisfier package is ignored without QUESTION After commit f57f8d33862050acc8d131710c100ba47877e675 pacman *silently* ignores packages from IgnorePkg/IgnoreGroup during dependency resolving, if prompt == 0. This behavior is changed to "give warning + ignore". (Otherwise the user is not informed about the fact that the package resolving was blocked by ignorepkg.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77efd512165ca2066dc6547bda52082f8bd11db2 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Nov 9 17:34:49 2008 +0100 New error type: PM_ERR_PKG_IGNORED This patch fixes FS#12059. Now sync_addtarget can return with PM_ERR_PKG_IGNORED, which indicates that although the requested package was found it is in ignorepkg, so alpm could not add it to the transaction. So the front-end can decide what to do. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 93ca155b48a29685914ffa10b11be42ef5d4734a Merge: 101c16b3eb8048dffd1c6c4438e84b759d2e2aff 0c614c181efec31ea8d3948745e5746b642cb10c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 13:50:56 2009 -0500 Merge branch 'xav/repo-add' commit 0c614c181efec31ea8d3948745e5746b642cb10c Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:13:52 2009 +0100 repo-add : rename gstmpdir to tmpdir What does gstmpdir mean? Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 91d43ba4b44e0827c6d9b66c70485672953f5a6d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:10:26 2009 +0100 repo-add : don't change the modification time on depends and desc The modification time on depends and desc file were changed to match the modification time of the package file. I don't see why and we are actualling losing information here. If we want to know the date of the package file, we can just look inside the depends file. If we want to know when the entry was created, we should not alter the modification time of depends and desc. Besides, this had the non-obvious and undocumented side effect that the depends file was always created, even if it was empty. And pacman actually does require that. So I added a "touch depends" to always create the file. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 59b4725bbb881140fea47dd2d1b09cef37e8a9dc Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Mar 3 17:05:14 2009 +0100 repo-add : new locking system Weird things could happen if several repo-add were run concurrently on the same database. The introduced locking system will prevent this to happen. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit a556bc57fccf9b35f9b2eca08ddae595c3a75592 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Feb 27 15:18:10 2009 +0100 repo-add : fix package variables declaration - arch was missing - backup is not used by repo-add. However makepkg still needs to put it in PKGINFO because pacman uses it - startdir is no longer used after the new delta implementation - the declaration of group, depend, backup, etc is not needed because these variables are always declared before being used : declare $var="$val" case "$var" in group) _groups="$_groups$group\n" ;; - reorder the variables declaration to follow the same order than they are written to the depends and desc file, for making future checks easier Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit bbcf96230ad16ad91f5ab8cb93c05fd15136d3e4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 19:06:16 2009 +0100 repo-add : rewrite delta support Use the correct database format Use xdelta3 to get the source and destination files from the delta itself Allow delta files to be added with repo-add just like package files. delta files can also be removed with repo-remove. This is simply done by looking for a .delta extension in the arguments, and calling the appropriate db_write_delta or db_remove_delta functions. Example usage: repo-add repo/test.db.tar.gz repo/libx11-1.1.99.2-2-x86_64.pkg.tar.gz repo-add repo/test.db.tar.gz repo/libx11-1.1.5-2_to_1.1.99.2-2-x86_64.delta repo-remove repo/test.db.tar.gz libx11-1.1.5-2_to_1.1.99.2-2-x86_64.delta Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 89685bdb2918c59a109cba2199ab25bc1bcfa784 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 20:08:33 2009 +0100 repo-add : drop delta support to rewrite it from scratch The current implementation has several problems : Wrong database format All the info is taken from the filename, which is a bit ugly It looks for .delta files in the current directory when adding a package, which is not very flexible Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 994804f20e51ea6dbbb236b919846a420b2d2369 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 20:02:05 2009 +0100 repo-add.sh.in : repo-remove improvements * report when a package entry to be removed is not found * backup and restore eventual "deltas" files * slight optimization when looking for an entry : only look at the entries starting with $pkgname Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit f8bb69c1d22473a3a82c6bab27799e3cada56a0a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 19:23:33 2009 +0100 repo-add cleanup Refactor the main loop, which was difficult to read. Use case instead of if when appropriate. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 9fa18d9a4b4ce5217842c71d8a45676e3fb9d3f4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 19:26:31 2009 +0100 Add pkgdelta script to create deltas. This should obsolete the delta support in makepkg. Having a separate script should be more flexible. Example usage: $ pkgdelta repo/tzdata-2009a-1-x86_64.pkg.tar.gz repo/tzdata-2009b-1-x86_64.pkg.tar.gz ==> Generating delta from version 2009a-1 to version 2009b-1 ==> Generated delta : 'repo/tzdata-2009a-1_to_2009b-1-x86_64.delta' Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit c8beffa7904abe7e0ad01fed6113acf449df15cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 19 19:12:34 2009 +0100 Fix several issues with xdelta 1) The changes to sync.c look big but there are mostly caused by the indentation. Fix a bug where download_size == 0 because the packages and deltas are already in the cache, but we still need to build the deltas list and apply the deltas to create the final package. 2) Fix the gzip / md5sum issue by switching to xdelta3, disabling external recompression and using gzip -n in pacman, and disable bsdtar compression and using gzip -n in makepkg. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 5 +- lib/libalpm/conflict.c | 90 ++++---- lib/libalpm/conflict.h | 3 +- lib/libalpm/delta.c | 5 +- lib/libalpm/deps.c | 14 ++- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 8 + lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 497 +++++++++++++++++++-------------------------- lib/libalpm/sync.h | 13 -- lib/libalpm/trans.c | 7 +- lib/libalpm/trans.h | 2 +- pactest/tests/trans001.py | 2 - scripts/.gitignore | 1 + scripts/Makefile.am | 3 + scripts/makepkg.sh.in | 23 ++- scripts/pkgdelta.sh.in | 165 +++++++++++++++ scripts/repo-add.sh.in | 378 +++++++++++++++++++++------------- src/pacman/sync.c | 9 +- src/pacman/util.c | 7 +- 22 files changed, 720 insertions(+), 519 deletions(-) create mode 100644 scripts/pkgdelta.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-123-g101c16b
by dan＠archlinux.org 11 Apr '09

11 Apr '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 101c16b3eb8048dffd1c6c4438e84b759d2e2aff (commit) via 52d184dae82dbcfe265683dac04ff1c7b0e5be74 (commit) via 63fc93607b3fb9950f927d0533742f0e1fc37dd0 (commit) from d15d4f923dcfbe4afe97fb89322ff1234e2445cd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 101c16b3eb8048dffd1c6c4438e84b759d2e2aff Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 11 13:09:14 2009 -0500 makepkg: fix double check on same path Commit 142225fd typo-ed this one, as it should look like the rest of the checks similar to it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52d184dae82dbcfe265683dac04ff1c7b0e5be74 Author: Loui Chang <louipc.ist(a)gmail.com> Date: Tue Apr 7 00:15:45 2009 -0400 makepkg: Fix integrity check when files are missing. The index in the for loop wasn't being incremented, so if the first file wasn't found, the second file would be compared to the first checksum, rather than the second. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 63fc93607b3fb9950f927d0533742f0e1fc37dd0 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Thu Apr 9 13:42:14 2009 +0800 Add detail documentation for alpm_db_update() This adds alpm_db_update() to the alpm_databases Doxygen group. The function is described in more detail and a code example is given. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 31 +++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 21 ++++++++++++--------- 2 files changed, 43 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0