- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (db.c db.h server.h)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Wednesday, February 28, 2007 @ 22:08:41 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: db.c (1.62 -> 1.63) db.h (1.26 -> 1.27) server.h (1.10 -> 1.11) * Fix up _alpm_db_free, remove use of void*. ----------+ db.c | 6 ++---- db.h | 2 +- server.h | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.62 pacman-lib/lib/libalpm/db.c:1.63 --- pacman-lib/lib/libalpm/db.c:1.62 Mon Feb 26 18:32:08 2007 +++ pacman-lib/lib/libalpm/db.c Wed Feb 28 22:08:41 2007 @@ -78,13 +78,11 @@ return(db); } -void _alpm_db_free(void *data) +void _alpm_db_free(pmdb_t *db) { - pmdb_t *db = data; - ALPM_LOG_FUNC; - FREELISTSERVERS(db->servers); + _FREELIST(db->servers, _alpm_server_free); FREE(db->path); FREE(db); Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.26 pacman-lib/lib/libalpm/db.h:1.27 --- pacman-lib/lib/libalpm/db.h:1.26 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/db.h Wed Feb 28 22:08:41 2007 @@ -48,7 +48,7 @@ /* db.c, database general calls */ pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename); -void _alpm_db_free(void *data); +void _alpm_db_free(pmdb_t *db); int _alpm_db_cmp(const void *db1, const void *db2); alpm_list_t *_alpm_db_search(pmdb_t *db, alpm_list_t *needles); pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback); Index: pacman-lib/lib/libalpm/server.h diff -u pacman-lib/lib/libalpm/server.h:1.10 pacman-lib/lib/libalpm/server.h:1.11 --- pacman-lib/lib/libalpm/server.h:1.10 Fri Feb 9 05:10:49 2007 +++ pacman-lib/lib/libalpm/server.h Wed Feb 28 22:08:41 2007 @@ -28,7 +28,6 @@ #include <download.h> #define FREESERVER(p) do { if(p){_alpm_server_free(p); p = NULL;}} while(0) -#define FREELISTSERVERS(p) _FREELIST(p, _alpm_server_free) /* Servers */ struct __pmserver_t {

1 0

[pacman-dev] RC 2007.02.16
by Aaron Griffin 28 Feb '07

28 Feb '07

Latest and greatest. Not all that many changes here.. -Si works with the repo/package syntax, spacing on the "saving as .pacsave" output is fixed, etc Mostly minor. Test it out: http://archlinux.org/~aaron/pacman/pacman-rc-2007.02.16-1-i686.pkg.tar.gz There is only one pending bug here, it's listed in the bugcatcher here: http://bugs.archlinux.org/task/6316 If anyone can reproduce that, let me know. I'm still trying to track that one down. Thanks guys!

6 19

[pacman-dev] 'replaces' confusion
by Aaron Griffin 28 Feb '07

28 Feb '07

So it appears the backend and pactest are both a little confused about where 'replaces' belongs. If we look at a current repo, 'replaces' is listed in the /desc file: $ cat /var/lib/pacman/current/gawk-3.1.5-3/desc %NAME% gawk %VERSION% 3.1.5-3 %DESC% Gnu version of awk %CSIZE% 552398 %MD5SUM% 4f539bb7ba6bb3328a2891ecf4ad2caf %REPLACES% mawk However, it appears that libalpm actually *writes* this info to the /depends file - replaces info is NOT written to the local DB. Please note that it appears this code is never actually hit. The db_write routine is not currently used when unpacking a remote DB, it is mostly untarred directly. In the future, however, this routine WILL be used to write DB info, so it is important to figure this out now: Where does 'replaces' info belong? I leave the question open, because i have no opinion, but I'd like to do this right - where does it fit best? The /depends file seems more appropriate, as it contains all the "list" info already. Anyone have an opinion?

6 21

[pacman-dev] CVS update of pacman-lib (7 files)
by Dan McGee 28 Feb '07

28 Feb '07

Date: Wednesday, February 28, 2007 @ 11:37:24 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/be_files.c (1.31 -> 1.32) lib/libalpm/package.c (1.78 -> 1.79) pactest/pmdb.py (1.4 -> 1.5) pactest/pmenv.py (1.7 -> 1.8) pactest/pmfile.py (1.3 -> 1.4) pactest/pmrule.py (1.4 -> 1.5) pactest/util.py (1.3 -> 1.4) * Unifying placement of REPLACES in desc file, as pacman2 does. We'll worry about bigger DB changes later, but lets not screw anything up for release. * Removed some weird uses of "not ... ==" usage in pactest- correct me if I'm wrong, but isn't "!=" a lot more clean and concise? * Print description of failed tests in the pactest summary. This could get dirty with a lot of failed tests though, so watch out. ------------------------+ lib/libalpm/be_files.c | 21 ++++++++++----------- lib/libalpm/package.c | 3 ++- pactest/pmdb.py | 25 ++++++++++++++----------- pactest/pmenv.py | 11 ++++++++--- pactest/pmfile.py | 4 ++-- pactest/pmrule.py | 2 +- pactest/util.py | 9 +++++---- 7 files changed, 42 insertions(+), 33 deletions(-) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.31 pacman-lib/lib/libalpm/be_files.c:1.32 --- pacman-lib/lib/libalpm/be_files.c:1.31 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/be_files.c Wed Feb 28 11:37:24 2007 @@ -365,10 +365,6 @@ if(fgets(info->md5sum, sizeof(info->md5sum), fp) == NULL) { goto error; } - /* XXX: these are only here as backwards-compatibility for pacman 2.x - * sync repos.... in pacman3, they have been moved to DEPENDS. - * Remove this when we move to pacman3 repos. - */ } else if(!strcmp(line, "%REPLACES%")) { /* the REPLACES tag is special -- it only appears in sync repositories, * not the local one. */ @@ -434,17 +430,20 @@ while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->provides = alpm_list_add(info->provides, strdup(line)); } - } else if(!strcmp(line, "%REPLACES%")) { - /* the REPLACES tag is special -- it only appears in sync repositories, - * not the local one. */ + } + /* TODO: we were going to move these things here, but it should wait. + * A better change would be to figure out how to restructure the DB. */ + /* else if(!strcmp(line, "%REPLACES%")) { + * the REPLACES tag is special -- it only appears in sync repositories, + * not the local one. * while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->replaces = alpm_list_add(info->replaces, strdup(line)); - } + } } else if(!strcmp(line, "%FORCE%")) { - /* FORCE tag only appears in sync repositories, - * not the local one. */ + * FORCE tag only appears in sync repositories, + * not the local one. * info->force = 1; - } + } */ } fclose(fp); fp = NULL; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.78 pacman-lib/lib/libalpm/package.c:1.79 --- pacman-lib/lib/libalpm/package.c:1.78 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 28 11:37:24 2007 @@ -178,7 +178,8 @@ } /* Parses the package description file for the current package - * + * TODO: this should ALL be in a backend interface (be_files), we should + * be dealing with the abstracted concepts only in this file * Returns: 0 on success, 1 on error * */ Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.4 pacman-lib/pactest/pmdb.py:1.5 --- pacman-lib/pactest/pmdb.py:1.4 Mon Feb 26 03:33:48 2007 +++ pacman-lib/pactest/pmdb.py Wed Feb 28 11:37:24 2007 @@ -193,11 +193,12 @@ pkg.conflicts = _getsection(fd) elif line == "%PROVIDES%": pkg.provides = _getsection(fd) - elif line == "%REPLACES%": - pkg.replaces = _getsection(fd) - elif line == "%FORCE%": - fd.readline() - pkg.force = 1 + # TODO this was going to be changed, but isn't anymore + #elif line == "%REPLACES%": + # pkg.replaces = _getsection(fd) + #elif line == "%FORCE%": + # fd.readline() + # pkg.force = 1 fd.close() pkg.checksum["depends"] = getmd5sum(filename) pkg.mtime["depends"] = getmtime(filename) @@ -253,6 +254,8 @@ else: if pkg.replaces: data.append(_mksection("REPLACES", pkg.replaces)) + if pkg.force: + data.append(_mksection("FORCE", "")) if pkg.csize: data.append(_mksection("CSIZE", pkg.csize)) if pkg.md5sum: @@ -293,11 +296,11 @@ data.append(_mksection("CONFLICTS", pkg.conflicts)) if pkg.provides: data.append(_mksection("PROVIDES", pkg.provides)) - if not self.treename == "local": - if pkg.replaces: - data.append(_mksection("REPLACES", pkg.replaces)) - if pkg.force: - data.append(_mksection("FORCE", "")) + #if self.treename != "local": + # if pkg.replaces: + # data.append(_mksection("REPLACES", pkg.replaces)) + # if pkg.force: + # data.append(_mksection("FORCE", "")) if data: data.append("") filename = os.path.join(path, "depends") @@ -354,7 +357,7 @@ and oldpkg.mtime[key] == (0, 0, 0) \ and pkg.mtime[key] == (0, 0, 0): continue - if not oldpkg.mtime[key][1:3] == pkg.mtime[key][1:3]: + if oldpkg.mtime[key][1:3] != pkg.mtime[key][1:3]: modified += 1 return modified Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.7 pacman-lib/pactest/pmenv.py:1.8 --- pacman-lib/pactest/pmenv.py:1.7 Tue Feb 27 14:44:45 2007 +++ pacman-lib/pactest/pmenv.py Wed Feb 28 11:37:24 2007 @@ -104,11 +104,16 @@ fail = test.result["fail"] rules = len(test.rules) if fail == 0: - print "[PASSED]", + result = "[PASSED]" else: - print "[FAILED]", + result = "[FAILED]" + print result, print "%s Rules: OK = %2u FAIL = %2u SKIP = %2u" \ - % (test.testname.ljust(32), success, fail, rules - (success + fail)) + % (test.testname.ljust(32), success, fail, \ + rules - (success + fail)) + if fail != 0: + # print test description if test failed + print " ", test.description print "=========="*8 print "Results" Index: pacman-lib/pactest/pmfile.py diff -u pacman-lib/pactest/pmfile.py:1.3 pacman-lib/pactest/pmfile.py:1.4 --- pacman-lib/pactest/pmfile.py:1.3 Mon Feb 26 03:19:02 2007 +++ pacman-lib/pactest/pmfile.py Wed Feb 28 11:37:24 2007 @@ -52,8 +52,8 @@ vprint("\t\told: %s / %s" % (self.checksum, self.mtime)) vprint("\t\tnew: %s / %s" % (checksum, mtime)) - if not self.checksum == checksum \ - or not (self.mtime[1], self.mtime[2]) == (mtime[1], mtime[2]): + if self.checksum != checksum \ + or (self.mtime[1], self.mtime[2]) != (mtime[1], mtime[2]): retval = 1 return retval Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.4 pacman-lib/pactest/pmrule.py:1.5 --- pacman-lib/pactest/pmrule.py:1.4 Tue Feb 27 23:00:21 2007 +++ pacman-lib/pactest/pmrule.py Wed Feb 28 11:37:24 2007 @@ -86,7 +86,7 @@ if not value in newpkg.requiredby: success = 0 elif case == "REASON": - if not newpkg.reason == int(value): + if newpkg.reason != int(value): success = 0 elif case == "FILES": if not value in newpkg.files: Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.3 pacman-lib/pactest/util.py:1.4 --- pacman-lib/pactest/util.py:1.3 Mon Feb 26 03:19:03 2007 +++ pacman-lib/pactest/util.py Wed Feb 28 11:37:24 2007 @@ -62,7 +62,7 @@ """ filename = "" link = "" - if not name.find(" -> ") == -1: + if name.find(" -> ") != -1: filename, link = name.split(" -> ") elif name[-1] == "*": filename = name.rstrip("*") @@ -80,7 +80,7 @@ link = "" filename = "" - if not name.find(" -> ") == -1: + if name.find(" -> ") != -1: islink = 1 filename, link = name.split(" -> ") elif name[-1] == "*": @@ -181,8 +181,9 @@ # Repositories data.extend(["[%s]\n" \ "server = file://%s\n" \ - % (value.treename, os.path.join(root, SYNCREPO, value.treename)) \ - for key, value in db.iteritems() if not key == "local"]) + % (value.treename, \ + os.path.join(root, SYNCREPO, value.treename)) \ + for key, value in db.iteritems() if key != "local"]) mkfile(os.path.join(root, filename), "\n".join(data))

1 0

[pacman-dev] Pacman, some thoughts
by Georg Grabler 28 Feb '07

28 Feb '07

Hello, I still spend some time looking a bit curious at pacman. It's rather the way it's coded, than the current features it provides. I mean, it's using quite everything marked as "bad style" in most books, and alot of those things could actually be avoided (Macros, goto). The 2nd thing is: You've been talking (and mentioning) ALPM documentation. I personally dislike manpages for interface documentation. I rather think about a interface documentation using Doxygen or similar tools. I've documented about 3 projects, more than 50.000 lines of code using doxygen the past week, and must say i'm happy with the result. Especially for the public SOAP interface it's nice having it, but also for internal reference and new developers who need some description about the functions in the code. And, hands (and heads) down, the code itself (functions etc.) isn't well inline documented. The last, but not least thing: SOURCE releases of RCs / nightly CVS checkouts. I've always been thinking about daily source tarballs. I've been thinking about providing such a script on my own, but my current provider forbids to have a public server running (sad but true, with cable 6mbit in/out). Why so? I'm often somewhere around the world, because of my job (italy, germany, ...), where i often connect in other infrastructures. I've to use a proxy, not supporting CVS. Since i havn't much to do in the evenings there, i actually want to do something - but can't. I don't think i'm the only one who would like nightly source checkouts being provided "as tarball".

3 2

[pacman-dev] Bug with pacman -Ss
by Douglas Soares de Andrade 28 Feb '07

28 Feb '07

Hi guys, I discovered a bug in pacman -Ss. Try in your consoles: pacman3 -Ss dvd+rw or pacman -Ss dvd+rw And the package exists: [douglas@ressonance ~]$ pacman3 -S dvd+rw-tools :: dvd+rw-tools-7.0-1: local version is up to date. Upgrade anyway? [Y/n] n warning: dvd+rw-tools-7.0-1 is up to date -- skipping local database is up to date [douglas@ressonance ~]$ Another doubt: Why it is giving me this response: warning: dvd+rw-tools-7.0-1 is up to date -- skipping local database is up to date About: warning: dvd+rw-tools-7.0-1 is up to date -- skipping I already know that it is up to date because of this line: :: dvd+rw-tools-7.0-1: local version is up to date. Upgrade anyway? [Y/n] n Why not keep the pacman2 behaviour ? -- Douglas Soares de Andrade Archlinux Brasil - http://archlinux-br.org Paradigma Internet - http://www.paradigma.com.br

4 5

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 28 Feb '07

28 Feb '07

Date: Wednesday, February 28, 2007 @ 00:08:25 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.54 -> 1.55) * Implemented Douglas' suggestion from the ML- print all integrity checks together while using makepkg -g. ---------+ makepkg | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.54 pacman-lib/scripts/makepkg:1.55 --- pacman-lib/scripts/makepkg:1.54 Mon Feb 26 03:43:02 2007 +++ pacman-lib/scripts/makepkg Wed Feb 28 00:08:25 2007 @@ -675,6 +675,12 @@ if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "Skipping source integrity checks -- using existing src/ tree" else + # TODO we end up checking $GENINTEG 3 times, could probably be refactored + if [ "$GENINTEG" = "1" ]; then + msg "Generating checksums for source files" + plain "" + fi + for integ in ${INTEGRITY_CHECK[@]}; do integ="$(echo $integ | tr A-Z a-z)" case "$integ" in @@ -692,8 +698,6 @@ #Generate integrity checks if [ "$GENINTEG" = "1" ]; then - msg "Generating ${integrity_name}s for source files" - plain "" ct=0 numsrc=${#source[@]} for netfile in "${source[@]}"; do @@ -712,7 +716,6 @@ echo fi done - plain "" #Validate integrity checks else integrity_sums=($(eval echo \${${integrity_name}s[@]})) @@ -744,6 +747,7 @@ done if [ "$GENINTEG" = "1" ]; then + plain "" exit 0 fi fi

1 0

[pacman-dev] CVS update of pacman-lib (10 files)
by Dan McGee 28 Feb '07

28 Feb '07

Date: Tuesday, February 27, 2007 @ 23:00:22 Author: dan Path: /home/cvs-pacman/pacman-lib Added: pactest/tests/upgrade057.py (1.1) Modified: doc/Makefile.am (1.16 -> 1.17) lib/libalpm/deps.c (1.70 -> 1.71) pactest/README (1.1 -> 1.2) pactest/pmrule.py (1.3 -> 1.4) pactest/tests/upgrade052.py (1.3 -> 1.4) pactest/tests/upgrade053.py (1.1 -> 1.2) pactest/tests/upgrade054.py (1.1 -> 1.2) pactest/tests/upgrade055.py (1.1 -> 1.2) pactest/tests/upgrade056.py (1.1 -> 1.2) * Added another test as suggested by Nagy on the ML- a package both provides for and is a dependency of another package. (upgrade057) * Removed man2html stuff from doc/Makefile.am. * Patch: improved depends checking in _alpm_checkdeps Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> * Slight revisions to pmrule.py to allow for a PKG_PROVIDES test. * Very quick updates to the pactest README. * Added rules to some of the newer upgrade tests. Note: upgrade055 now fails due to requiredby entries not being written packages that are dependencies in a provides role. -----------------------------+ doc/Makefile.am | 20 ----------------- lib/libalpm/deps.c | 49 ++++++++++++++++-------------------------- pactest/README | 22 +++++++++++++----- pactest/pmrule.py | 3 ++ pactest/tests/upgrade052.py | 1 pactest/tests/upgrade053.py | 1 pactest/tests/upgrade054.py | 1 pactest/tests/upgrade055.py | 2 + pactest/tests/upgrade056.py | 2 + pactest/tests/upgrade057.py | 23 +++++++++++++++++++ 10 files changed, 68 insertions(+), 56 deletions(-) Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.16 pacman-lib/doc/Makefile.am:1.17 --- pacman-lib/doc/Makefile.am:1.16 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/Makefile.am Tue Feb 27 23:00:21 2007 @@ -12,26 +12,6 @@ EXTRA_DIST = $(man_MANS) -MAN2HTML=man2html -r -SUFFIXES=.3 .5 .8 .3.html .5.html .8.html - -# targets for each man section, sed removes a weird artifact left by man2html -.3.3.html: - $(RM) $@ - -${MAN2HTML} $< | sed '1,2d' > $@ - -.5.5.html: - $(RM) $@ - -${MAN2HTML} $< | sed '1,2d' > $@ - -.8.8.html: - $(RM) $@ - -${MAN2HTML} $< | sed '1,2d' > $@ - -man2html: pacman.8.html makepkg.8.html PKGBUILD.5.html makepkg.conf.5.html pacman.conf.5.html libalpm.3.html - clean-local: - $(RM) *.html $(RM) man3/*.3 -.PHONY: man2html Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.70 pacman-lib/lib/libalpm/deps.c:1.71 --- pacman-lib/lib/libalpm/deps.c:1.70 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/deps.c Tue Feb 27 23:00:21 2007 @@ -187,10 +187,12 @@ return(newtargs); } -/* Returns a alpm_list_t* of missing_t pointers. - * - * dependencies can include versions with depmod operators. - * +/** Checks dependencies and returns missing ones in a list. Dependencies can include versions with depmod operators. + * @param trans pointer to the transaction object + * @param db pointer to the local package database + * @param op transaction type + * @param packages an alpm_list_t* of packages to be checked + * @return an alpm_list_t* of missing_t pointers. */ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op, alpm_list_t *packages) @@ -236,32 +238,19 @@ continue; } _alpm_db_read(db, p, INFRQ_DEPENDS); - for(k = p->depends; k && !found; k = k->next) { - /* find the dependency info in p->depends */ - _alpm_splitdep(k->data, &depend); - if(!strcmp(depend.name, oldpkg->name)) { - found = 1; - } - } - if(found == 0) { - /* look for packages that list depend.name as a "provide" */ - alpm_list_t *provides = _alpm_db_whatprovides(db, depend.name); - if(provides == NULL) { - /* not found */ - continue; - } - /* we found an installed package that provides depend.name */ - FREELISTPTR(provides); - } - if(!_alpm_depcmp(tp, &depend)) { - _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), - depend.name, p->name); - miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, - depend.name, depend.version); - if(!_alpm_depmiss_isin(miss, baddeps)) { - baddeps = alpm_list_add(baddeps, miss); - } else { - FREE(miss); + for(k = p->depends; k; k = k->next) { + /* don't break any existing dependencies (possible provides) */ + _alpm_splitdep(k->data, &depend); + if(_alpm_depcmp(oldpkg, &depend) && !_alpm_depcmp(tp, &depend)) { + _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), + oldpkg->name, p->name); + miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, + depend.name, depend.version); + if(!_alpm_depmiss_isin(miss, baddeps)) { + baddeps = alpm_list_add(baddeps, miss); + } else { + FREE(miss); + } } } } Index: pacman-lib/pactest/README diff -u pacman-lib/pactest/README:1.1 pacman-lib/pactest/README:1.2 --- pacman-lib/pactest/README:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/README Tue Feb 27 23:00:21 2007 @@ -102,7 +102,7 @@ option ------ -A dictionnary that holds the data used in the pacman configuration file. +A dictionary that holds the data used in the pacman configuration file. It has 3 keys, each one of them pointing at a list of strings: - noupgrade - noextract @@ -269,9 +269,8 @@ PACMAN_RETCODE=value PACMAN_OUTPUT=value -For the RETCODE one, pactest will compare pacman return code with the value -provided as an item. -For the OUTPUT one, pactest will grep pacman outputs for the given value. +For RETCODE, pactest will ensure the pacman return code is the value given. +For OUTPUT, pactest will grep pacman outputs for the given value. Note: PACMAN_OUTPUT should not be used. Pacman outputs are likely to change from one release to another, so that it's reliability is quite low. @@ -286,14 +285,19 @@ PKG_EXIST=name PKG_MODIFIED=name PKG_VERSION=name|version + PKG_GROUPS=name|group + PKG_PROVIDES=name|providename PKG_DEPENDS=name|depname PKG_REQUIREDBY=name|reqbyname + PKG_REASON=name|intvalue + PKG_FILES=name|filename + PKG_BACKUP=name|backupname Example: PKG_DEPENDS=ncurses|glibc -pactest will test the local database entry "ncurses" has "glibc" in its -DEPENDS field. +pactest will test to ensure the local database entry "ncurses" has "glibc" in +its DEPENDS field. . FILE rules @@ -302,3 +306,9 @@ FILE_PACNEW=path/to/file FILE_PACSAVE=path/to/file FILE_PACORIG=path/to/file + +Example: + FILE_EXIST=etc/test.conf + +pactest will ensure the file /etc/test.conf exists in the filesystem. + Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.3 pacman-lib/pactest/pmrule.py:1.4 --- pacman-lib/pactest/pmrule.py:1.3 Mon Feb 26 03:19:02 2007 +++ pacman-lib/pactest/pmrule.py Tue Feb 27 23:00:21 2007 @@ -76,6 +76,9 @@ elif case == "GROUPS": if not value in newpkg.groups: success = 0 + elif case == "PROVIDES": + if not value in newpkg.provides: + success = 0 elif case == "DEPENDS": if not value in newpkg.depends: success = 0 Index: pacman-lib/pactest/tests/upgrade052.py diff -u pacman-lib/pactest/tests/upgrade052.py:1.3 pacman-lib/pactest/tests/upgrade052.py:1.4 --- pacman-lib/pactest/tests/upgrade052.py:1.3 Tue Feb 27 11:15:47 2007 +++ pacman-lib/pactest/tests/upgrade052.py Tue Feb 27 23:00:21 2007 @@ -18,3 +18,4 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-1") +self.addrule("PKG_PROVIDES=pkg2|imaginary") Index: pacman-lib/pactest/tests/upgrade053.py diff -u pacman-lib/pactest/tests/upgrade053.py:1.1 pacman-lib/pactest/tests/upgrade053.py:1.2 --- pacman-lib/pactest/tests/upgrade053.py:1.1 Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade053.py Tue Feb 27 23:00:21 2007 @@ -17,3 +17,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_REQUIREDBY=pkg2|pkg1") Index: pacman-lib/pactest/tests/upgrade054.py diff -u pacman-lib/pactest/tests/upgrade054.py:1.1 pacman-lib/pactest/tests/upgrade054.py:1.2 --- pacman-lib/pactest/tests/upgrade054.py:1.1 Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade054.py Tue Feb 27 23:00:21 2007 @@ -17,3 +17,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_REQUIREDBY=pkg2|pkg1") Index: pacman-lib/pactest/tests/upgrade055.py diff -u pacman-lib/pactest/tests/upgrade055.py:1.1 pacman-lib/pactest/tests/upgrade055.py:1.2 --- pacman-lib/pactest/tests/upgrade055.py:1.1 Tue Feb 27 11:15:47 2007 +++ pacman-lib/pactest/tests/upgrade055.py Tue Feb 27 23:00:21 2007 @@ -24,3 +24,5 @@ self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg3") +self.addrule("PKG_REQUIREDBY=pkg2|pkg1") +self.addrule("PKG_DEPENDS=pkg1|imaginary") Index: pacman-lib/pactest/tests/upgrade056.py diff -u pacman-lib/pactest/tests/upgrade056.py:1.1 pacman-lib/pactest/tests/upgrade056.py:1.2 --- pacman-lib/pactest/tests/upgrade056.py:1.1 Tue Feb 27 14:44:45 2007 +++ pacman-lib/pactest/tests/upgrade056.py Tue Feb 27 23:00:21 2007 @@ -22,3 +22,5 @@ self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg3") +self.addrule("!PKG_REQUIREDBY=pkg1|pkg2") +self.addrule("PKG_REQUIREDBY=pkg1|pkg3") Index: pacman-lib/pactest/tests/upgrade057.py diff -u /dev/null pacman-lib/pactest/tests/upgrade057.py:1.1 --- /dev/null Tue Feb 27 23:00:22 2007 +++ pacman-lib/pactest/tests/upgrade057.py Tue Feb 27 23:00:22 2007 @@ -0,0 +1,23 @@ +self.description = "Upgrade a package that both provides and is a dependency" + +lp1 = pmpkg("pkg1") +lp1.depends = ["pkg2", "imag3"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imag3"] +lp2.requiredby = ["pkg1"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-2") +p.provides = ["imag3"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg2|1.0-2") +self.addrule("PKG_REQUIREDBY=pkg2|pkg1") +self.addrule("PKG_DEPENDS=pkg1|pkg2") +self.addrule("PKG_DEPENDS=pkg1|imag3")

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (3 files)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Tuesday, February 27, 2007 @ 15:49:24 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: sync895.py (1.1) sync896.py (1.1) Modified: sync897.py (1.3 -> 1.4) * Some new tests. That bring new failures. :) ------------+ sync895.py | 20 ++++++++++++++++++++ sync896.py | 21 +++++++++++++++++++++ sync897.py | 5 +---- 3 files changed, 42 insertions(+), 4 deletions(-) Index: pacman-lib/pactest/tests/sync895.py diff -u /dev/null pacman-lib/pactest/tests/sync895.py:1.1 --- /dev/null Tue Feb 27 15:49:24 2007 +++ pacman-lib/pactest/tests/sync895.py Tue Feb 27 15:49:23 2007 @@ -0,0 +1,20 @@ +self.description = "Sync causes single package removal of a provide (failure)" + +sp = pmpkg("pkg3") +sp.conflicts = ["pkg1"] +self.addpkg2db("sync", sp) + +lp1 = pmpkg("pkg1") +lp1.provides = ["foo"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.depends = ["foo"] +self.addpkg2db("local", lp2) + +self.args = "-S %s" % sp.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") Index: pacman-lib/pactest/tests/sync896.py diff -u /dev/null pacman-lib/pactest/tests/sync896.py:1.1 --- /dev/null Tue Feb 27 15:49:24 2007 +++ pacman-lib/pactest/tests/sync896.py Tue Feb 27 15:49:24 2007 @@ -0,0 +1,21 @@ +self.description = "Sync causes single package removal of a provide (success)" + +sp = pmpkg("pkg3") +sp.conflicts = ["pkg1"] +sp.provides = ["foo"] +self.addpkg2db("sync", sp) + +lp1 = pmpkg("pkg1") +lp1.provides = ["foo"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.depends = ["foo"] +self.addpkg2db("local", lp2) + +self.args = "-S %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") Index: pacman-lib/pactest/tests/sync897.py diff -u pacman-lib/pactest/tests/sync897.py:1.3 pacman-lib/pactest/tests/sync897.py:1.4 --- pacman-lib/pactest/tests/sync897.py:1.3 Fri Feb 23 01:50:43 2007 +++ pacman-lib/pactest/tests/sync897.py Tue Feb 27 15:49:24 2007 @@ -1,22 +1,19 @@ self.description = "System upgrade with package conflicts" sp1 = pmpkg("pkg1", "1.0-2") -sp1.conflicts = ["pkg2"] -sp1.provides = ["pkg2"] +sp1.conflicts = ["pkg2", "pkg3"] self.addpkg2db("sync", sp1); sp2 = pmpkg("pkg2", "1.0-2") self.addpkg2db("sync", sp2) lp1 = pmpkg("pkg1") -lp1.conflicts = ["pkg2"] self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") -lp3.conflicts = ["pkg1"] self.addpkg2db("local", lp3) self.args = "-Su"

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pmpkg.py)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Tuesday, February 27, 2007 @ 11:25:03 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Modified: pmpkg.py (1.3 -> 1.4) * Prevent this error when creating empty packages. tar: *: Cannot stat: No such file or directory tar: Error exit delayed from previous errors ----------+ pmpkg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/pactest/pmpkg.py diff -u pacman-lib/pactest/pmpkg.py:1.3 pacman-lib/pactest/pmpkg.py:1.4 --- pacman-lib/pactest/pmpkg.py:1.3 Tue Feb 27 03:32:52 2007 +++ pacman-lib/pactest/pmpkg.py Tue Feb 27 11:25:01 2007 @@ -165,11 +165,12 @@ # .FILELIST if self.files: os.system("tar cvf /dev/null * | sort >.FILELIST") + targets += " .FILELIST *" else: #prevent some pacman warnings... I expect a real package would #always have at least one file... os.system("touch .FILELIST") - targets += " .FILELIST *" + targets += " .FILELIST" # Generate package archive os.system("tar zcf %s %s" % (archive, targets))

1 0