- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] undocumented features, bugs and why pacman's speed cannot be tuned...
by Nagy Gabor 27 Feb '07

27 Feb '07

Hi! I looked into the source of pacman (I want to speed it up), I haven't finished yet, but I'd like to share some of my impressions: 1. There are some undocumented features: -Syy (force sync remote repos), -A, -U can install from http://, ftp://; -Sgg list groups with their content 2. The main problem with speed, that pacman always reads the repos: I thought, that in the case of sync repos, this is absolutely not needed in most cases (an "ls" is enough) and when all information is needed (e.g. when -Ss is invoked) we may use the ungziped db. But of course, in local repo we cannot use a db file. I am disappointed, because in almost all cases (-S -A -U) the whole localdb must be cached. Why? Because of conflict checking and provide checking (this problem can be solved, as I wrote in my previous e-mail; but needs to convert (just adding some new symlinks to) the existing local repo). The main problem, when you install a new package, it is needed to fill in the requiredby field (you may say, that this is needless, nut it's not, because you may have broked dependencies with -d earlier) :-( 3. Probably when 2 packages provide the same content and they are not mutual, bugs can happen: as I can see from the source (someone should test) if foo1 and foo2 provides foo, and you install foo3 which needs foo, then requieredby foo3 is set for both foo1 and foo2. And you won't be able to remove neigther foo1 and nor foo2 until you remove foo3, however foo3's foo dependency is satisfied until at least one of the foo-providers is installed. Bye, Nagy Gabor

4 11

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

27 Feb '07

Date: Tuesday, February 27, 2007 @ 11:15:47 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Added: tests/upgrade055.py (1.1) Modified: Makefile.am (1.1 -> 1.2) tests/upgrade052.py (1.2 -> 1.3) Removed: COPYING (1.1) * Updated description of test upgrade052. * Added the actual "Nagy's bug" as upgrade055.py. * Updated the Makefile to distribute the pactest readme. * Removed COPYING from the pactest directory- see COPYING at the root for the same license. ---------------------+ COPYING | 340 -------------------------------------------------- Makefile.am | 6 tests/upgrade052.py | 2 tests/upgrade055.py | 26 +++ 4 files changed, 32 insertions(+), 342 deletions(-) Index: pacman-lib/pactest/COPYING diff -u pacman-lib/pactest/COPYING:1.1 pacman-lib/pactest/COPYING:removed --- pacman-lib/pactest/COPYING:1.1 Sun Oct 15 15:04:27 2006 +++ pacman-lib/pactest/COPYING Tue Feb 27 11:15:47 2007 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Index: pacman-lib/pactest/Makefile.am diff -u pacman-lib/pactest/Makefile.am:1.1 pacman-lib/pactest/Makefile.am:1.2 --- pacman-lib/pactest/Makefile.am:1.1 Thu Feb 22 16:34:52 2007 +++ pacman-lib/pactest/Makefile.am Tue Feb 27 11:15:47 2007 @@ -12,4 +12,8 @@ noinst_SCRIPTS = $(check_SCRIPTS) -EXTRA_DIST = $(check_SCRIPTS) +EXTRA_DIST = \ + README \ + TODO \ + ChangeLog \ + $(check_SCRIPTS) Index: pacman-lib/pactest/tests/upgrade052.py diff -u pacman-lib/pactest/tests/upgrade052.py:1.2 pacman-lib/pactest/tests/upgrade052.py:1.3 --- pacman-lib/pactest/tests/upgrade052.py:1.2 Tue Feb 27 03:29:02 2007 +++ pacman-lib/pactest/tests/upgrade052.py Tue Feb 27 11:15:47 2007 @@ -1,4 +1,4 @@ -self.description = "Nagy's bug (I think) -- in progress" +self.description = "Upgrade to a package that provides less than before" lp1 = pmpkg("pkg1") lp1.depends = ["imaginary"] Index: pacman-lib/pactest/tests/upgrade055.py diff -u /dev/null pacman-lib/pactest/tests/upgrade055.py:1.1 --- /dev/null Tue Feb 27 11:15:47 2007 +++ pacman-lib/pactest/tests/upgrade055.py Tue Feb 27 11:15:47 2007 @@ -0,0 +1,26 @@ +self.description = "Upgrade a package that provides one of two imaginary packages" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary", "imaginary2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary"] +lp2.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.provides = ["imaginary2"] +lp3.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp3) + +p = pmpkg("pkg2", "1.0-2") +p.provides = ["imaginary"] +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_EXIST=pkg3")

1 0