- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (3 files)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 23:54:49 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.16 -> 1.17) pactest/pactest.py (1.5 -> 1.6) pactest/pmtest.py (1.3 -> 1.4) * Fixed globbing for pactest --test argument * --manual-confirm was handled in the wrong order --------------------+ Makefile.am | 2 +- pactest/pactest.py | 14 ++++++++++---- pactest/pmtest.py | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.16 pacman-lib/Makefile.am:1.17 --- pacman-lib/Makefile.am:1.16 Thu Feb 22 21:00:30 2007 +++ pacman-lib/Makefile.am Thu Feb 22 23:54:49 2007 @@ -9,6 +9,6 @@ # TODO : figure out a way to get 'make distcheck' to build with # --disable-fakeroot so it actually passes tests check-local: src/pacman - python $(top_srcdir)/pactest/pactest.py --test=$(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 + python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 rm -rf $(top_builddir)/root Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.5 pacman-lib/pactest/pactest.py:1.6 --- pacman-lib/pactest/pactest.py:1.5 Thu Feb 22 23:22:21 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 23:54:49 2007 @@ -32,13 +32,20 @@ setattr(parser.values, option.dest, os.path.abspath(value)) def globTests(option, opt_str, value, parser): + idx=0 globlist = [] - globlist.extend(glob.glob(value)) + + # maintain the idx so we can modify rargs + while not parser.rargs[idx].startswith('-'): + globlist += glob.glob(parser.rargs[idx]) + idx += 1 + + parser.rargs = parser.rargs[idx:] setattr(parser.values, option.dest, globlist) def createOptParser(): testcases = [] - usage = "usage: %prog [options] [[--test=<path/to/testfile.py>] ...]" + usage = "usage: %prog [options] [[--test <path/to/testfile.py>] ...]" description = "Runs automated tests on the pacman binary. Tests are " \ "described using an easy python syntax, and several can be " \ "ran at once." @@ -55,8 +62,7 @@ dest = "bin", default = "pacman", help = "specify location of the pacman binary") parser.add_option("-t", "--test", action = "callback", - callback = globTests, type = "string", - dest = "testcases", + callback = globTests, dest = "testcases", help = "specify test case(s)") parser.add_option("--nolog", action = "store_true", dest = "nolog", default = False, Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.3 pacman-lib/pactest/pmtest.py:1.4 --- pacman-lib/pactest/pmtest.py:1.3 Thu Feb 22 23:22:21 2007 +++ pacman-lib/pactest/pmtest.py Thu Feb 22 23:54:49 2007 @@ -188,10 +188,10 @@ cmd.append("libtool gdb --args") if pacman["valgrind"]: cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes") - if not pacman["manual-confirm"]: - cmd.append("--noconfirm") cmd.append("%s --config=%s --root=%s" \ % (pacman["bin"], os.path.join(self.root, PACCONF), self.root)) + if not pacman["manual-confirm"]: + cmd.append("--noconfirm") if pacman["debug"]: cmd.append("--debug=%s" % pacman["debug"]) cmd.append("%s" % self.args)

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pactest.py pmtest.py)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 23:22:21 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.4 -> 1.5) pmtest.py (1.2 -> 1.3) * Removed a stray print statement left in there * Fail when no tests defined * Added --manual-confirm to help with hand testing ------------+ pactest.py | 18 ++++++++++++------ pmtest.py | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.4 pacman-lib/pactest/pactest.py:1.5 --- pacman-lib/pactest/pactest.py:1.4 Thu Feb 22 21:10:56 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 23:22:21 2007 @@ -34,7 +34,6 @@ def globTests(option, opt_str, value, parser): globlist = [] globlist.extend(glob.glob(value)) - print "globlist=%s" % globlist setattr(parser.values, option.dest, globlist) def createOptParser(): @@ -68,6 +67,9 @@ parser.add_option("--valgrind", action = "store_true", dest = "valgrind", default = False, help = "use valgrind while calling pacman") + parser.add_option("--manual-confirm", action = "store_true", + dest = "manualconfirm", default = False, + help = "do not use --noconfirm for pacman calls") return parser @@ -84,11 +86,15 @@ env.pacman["nolog"] = opts.nolog env.pacman["gdb"] = opts.gdb env.pacman["valgrind"] = opts.valgrind - for i in opts.testcases: - env.addtest(i) + env.pacman["manual-confirm"] = opts.manualconfirm - # run tests and print overall results - env.run() - env.results() + if len(opts.testcases) == 0: + print "no tests defined, nothing to do" + else: + for i in opts.testcases: env.addtest(i) + + # run tests and print overall results + env.run() + env.results() # vim: set ts=4 sw=4 et: Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.2 pacman-lib/pactest/pmtest.py:1.3 --- pacman-lib/pactest/pmtest.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmtest.py Thu Feb 22 23:22:21 2007 @@ -188,7 +188,9 @@ cmd.append("libtool gdb --args") if pacman["valgrind"]: cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes") - cmd.append("%s --noconfirm --config=%s --root=%s" \ + if not pacman["manual-confirm"]: + cmd.append("--noconfirm") + cmd.append("%s --config=%s --root=%s" \ % (pacman["bin"], os.path.join(self.root, PACCONF), self.root)) if pacman["debug"]: cmd.append("--debug=%s" % pacman["debug"])

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (pacman.c)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 22:40:20 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.100 -> 1.101) We don't need this anymore ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.100 pacman-lib/src/pacman/pacman.c:1.101 --- pacman-lib/src/pacman/pacman.c:1.100 Thu Feb 22 16:34:52 2007 +++ pacman-lib/src/pacman/pacman.c Thu Feb 22 22:40:20 2007 @@ -166,7 +166,7 @@ printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION); printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>\n"); - printf("\\ '-. '-' '-' '-' & Frugalware developers <frugalware-devel(a)frugalware.org>\n"); + printf("\\ '-. '-' '-' '-'\n"); printf(" '--' \n"); printf(_(" This program may be freely redistributed under\n")); printf(_(" the terms of the GNU General Public License\n"));

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 22:23:07 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.35 -> 1.36) doc/.cvsignore (1.2 -> 1.3) doc/Makefile.am (1.15 -> 1.16) doc/PKGBUILD.5 (1.7 -> 1.8) doc/libalpm.3 (1.4 -> 1.5) doc/makepkg.8 (1.6 -> 1.7) doc/makepkg.conf.5 (1.2 -> 1.3) doc/pacman.8 (1.6 -> 1.7) doc/pacman.conf.5 (1.2 -> 1.3) * Removed man2html stuff from configure. It is now available in the doc/ directory by running the target man2html, e.g. 'make man2html'. * Slightly fixed up the bottom of the manpages. --------------------+ configure.ac | 23 ----------------------- doc/.cvsignore | 1 + doc/Makefile.am | 48 ++++++++++++++++++++++++------------------------ doc/PKGBUILD.5 | 3 ++- doc/libalpm.3 | 3 ++- doc/makepkg.8 | 3 ++- doc/makepkg.conf.5 | 3 ++- doc/pacman.8 | 3 ++- doc/pacman.conf.5 | 3 ++- 9 files changed, 37 insertions(+), 53 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.35 pacman-lib/configure.ac:1.36 --- pacman-lib/configure.ac:1.35 Thu Feb 22 21:00:30 2007 +++ pacman-lib/configure.ac Thu Feb 22 22:23:06 2007 @@ -38,11 +38,6 @@ AM_PROG_LIBTOOL AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes") -dnl Help line for man2html -AC_ARG_ENABLE(man2html, - AC_HELP_STRING([--enable-man2html], [Build html docs via man2html]), - [wantman2html=$enableval], [wantman2html=no]) - dnl Help line for doxygen AC_ARG_ENABLE(doxygen, AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]), @@ -118,23 +113,6 @@ AC_MSG_CHECKING(your blood pressure) AC_MSG_RESULT([a bit high, but we can proceed]) -dnl Check for man2html binary -AC_MSG_CHECKING(for man2html) -if test "x$wantman2html" = "xyes" ; then - AC_CHECK_PROGS([MAN2HTML], [man2html]) - if test $MAN2HTML ; then - AC_MSG_RESULT(yes) - useman2html=yes - else - AC_MSG_RESULT(no, man2html missing) - useman2html=no - fi -else - AC_MSG_RESULT(no, disabled by configure) - useman2html=no -fi -AM_CONDITIONAL(HAS_MAN2HTML, test "x$useman2html" = "xyes") - dnl Check for doxygen support AC_MSG_CHECKING(for doxygen) if test "x$wantdoxygen" = "xyes" ; then @@ -242,7 +220,6 @@ pacman.conf location : ${configfile} Doxygen support : ${usedoxygen} - man2html support : ${useman2html} debug support : ${debug} fakeroot-proof support : ${fakeroot} " Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.2 pacman-lib/doc/.cvsignore:1.3 --- pacman-lib/doc/.cvsignore:1.2 Fri Feb 9 16:54:57 2007 +++ pacman-lib/doc/.cvsignore Thu Feb 22 22:23:06 2007 @@ -1,3 +1,4 @@ Makefile Makefile.in +*.html man3 Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.15 pacman-lib/doc/Makefile.am:1.16 --- pacman-lib/doc/Makefile.am:1.15 Thu Feb 22 16:34:51 2007 +++ pacman-lib/doc/Makefile.am Thu Feb 22 22:23:07 2007 @@ -1,27 +1,3 @@ -all: makepkg.8 pacman.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 - -if HAS_MAN2HTML -makepkg.8: - man2html makepkg.8 > html/makepkg.8.html - -pacman.8: - man2html pacman.8 > html/pacman.8.html - -PKGBUILD.5: - man2html PKGBUILD.5 > html/PKGBUILD.5.html - -makepkg.conf.5: - man2html makepkg.8 > html/makepkg.8.html - -pacman.conf.5: - man2html pacman.conf.5 > html/pacman.conf.5.html - -endif - -clean: - rm -f html/*.html - rm -f man3/*.3 - man_MANS = \ pacman.8 \ makepkg.8 \ @@ -35,3 +11,27 @@ endif 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/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.7 pacman-lib/doc/PKGBUILD.5:1.8 --- pacman-lib/doc/PKGBUILD.5:1.7 Sun Feb 11 20:08:35 2007 +++ pacman-lib/doc/PKGBUILD.5 Thu Feb 22 22:23:07 2007 @@ -269,5 +269,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/libalpm.3 diff -u pacman-lib/doc/libalpm.3:1.4 pacman-lib/doc/libalpm.3:1.5 --- pacman-lib/doc/libalpm.3:1.4 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/libalpm.3 Thu Feb 22 22:23:07 2007 @@ -48,5 +48,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/makepkg.8 diff -u pacman-lib/doc/makepkg.8:1.6 pacman-lib/doc/makepkg.8:1.7 --- pacman-lib/doc/makepkg.8:1.6 Wed Feb 14 10:06:03 2007 +++ pacman-lib/doc/makepkg.8 Thu Feb 22 22:23:07 2007 @@ -141,5 +141,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/makepkg.conf.5 diff -u pacman-lib/doc/makepkg.conf.5:1.2 pacman-lib/doc/makepkg.conf.5:1.3 --- pacman-lib/doc/makepkg.conf.5:1.2 Fri Feb 9 10:37:20 2007 +++ pacman-lib/doc/makepkg.conf.5 Thu Feb 22 22:23:07 2007 @@ -142,5 +142,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.6 pacman-lib/doc/pacman.8:1.7 --- pacman-lib/doc/pacman.8:1.6 Sat Feb 10 19:27:45 2007 +++ pacman-lib/doc/pacman.8 Thu Feb 22 22:23:07 2007 @@ -259,5 +259,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/pacman.conf.5 diff -u pacman-lib/doc/pacman.conf.5:1.2 pacman-lib/doc/pacman.conf.5:1.3 --- pacman-lib/doc/pacman.conf.5:1.2 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/pacman.conf.5 Thu Feb 22 22:23:07 2007 @@ -137,5 +137,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors.

1 0

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 21:15:00 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.18 -> 1.19) Just some changes to my TODO ------------+ TODO.aaron | 69 +++++++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 42 deletions(-) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.18 pacman-lib/TODO.aaron:1.19 --- pacman-lib/TODO.aaron:1.18 Wed Feb 21 02:12:34 2007 +++ pacman-lib/TODO.aaron Thu Feb 22 21:15:00 2007 @@ -19,50 +19,37 @@ to evaluate both a bit more. * src/pacman: - - There's quite a few single function headers which contain the pacman_* - functions. We should move these to a single header (pacman.h) to clean up - the source a bit. - -* lib/libalpm: - - move logging (alpm_logaction) out of the library. log files should be - written by the app, not the library. Adding a PM_LOG_* constant that - frontends can recognize and send to a file is probably a good idea. - - clear up list allocation/deallocation - some lists need to be free'd, some - do not and there is no clear indication WHEN this should happen. - - remove DB entries (directories) on a read error? - - Add a pm_errstr error string, which will allow us to do things like: - pm_errno = PM_ERR_LIBARCHIVE; - pm_errstr = archive_error_string(archive); - or: - pm_errno = PM_ERR_LIBDOWNLOAD; - pm_errstr = downloadLastErrString; - This way we don't break abstraction when returning specific errors in - cases like the above. + There's quite a few single function headers which contain the pacman_* + functions. We should move these to a single header (pacman.h) to clean up + the source a bit. + +* libalpm -> front end communication needs a work-up. Both progress functions + can be combined into one callback, IFF we adjust it to accept a prefix string + for the progress bars, and format it at the lib side. Question functions + should also do the same - create the string at the library side, and simply + call some sort of int yes_no = ask_question("Do foo with bar?"); + +* move logging (alpm_logaction) out of the library. log files should be + written by the app, not the library. Adding a PM_LOG_* constant that + frontends can recognize and send to a file is probably a good idea. + +* clear up list allocation/deallocation - some lists need to be free'd, some + do not and there is no clear indication WHEN this should happen. + +* remove DB entries (directories) on a read error? + +* Add a pm_errstr error string, which will allow us to do things like: + pm_errno = PM_ERR_LIBARCHIVE; + pm_errstr = archive_error_string(archive); + or: + pm_errno = PM_ERR_LIBDOWNLOAD; + pm_errstr = downloadLastErrString; + This way we don't break abstraction when returning specific errors in + cases like the above. * pacman: A LOT of functions are way too long. There should be an upper limit of 100-200 lines. _alpm_add_commit is around 600 lines, and is far too complex. - Quite a lot of this needs to be refactored as we go. - Function list (from Dan McGee): - add.c: - _alpm_add_commit - be_files.c: - _alpm_db_read - _alpm_db_write - conflict.c: - _alpm_checkconflicts - _alpm_db_find_conflicts - package.c: - _alpm_pkg_load (getting a bit long) - remove.c: - _alpm_remove_commit - server.c: - _alpm_downloadfiles_forreal - sync.c: - _alpm_sync_sysupgrade (getting there) - _alpm_sync_prepare - _alpm_sync_commit - * pacman: fixup doxygen documentation for public interface * libalpm: just because a function is in alpm.h doesn't mean it needs to be in @@ -89,5 +76,3 @@ **** BUGS **** * Removal of conflicts on -A and -U (INCOMPLETE) -* pacman: add pactest cases/functionality for all -Q operations and make sure - the output is sane

1 0

[pacman-dev] CVS update of pacman-lib (5 files)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 21:10:56 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/package.c (1.74 -> 1.75) lib/libalpm/package.h (1.31 -> 1.32) lib/libalpm/sync.c (1.102 -> 1.103) pactest/pactest.py (1.3 -> 1.4) src/pacman/trans.c (1.38 -> 1.39) * Modified the handling and output w.r.t. IgnorePkg entries. -Sy always ignores these packages, but -S explicitly asks for confirmation. -----------------------+ lib/libalpm/package.c | 8 +++++--- lib/libalpm/package.h | 2 +- lib/libalpm/sync.c | 44 +++++++++++++++++++++++--------------------- pactest/pactest.py | 1 + src/pacman/trans.c | 6 +++++- 5 files changed, 35 insertions(+), 26 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.74 pacman-lib/lib/libalpm/package.c:1.75 --- pacman-lib/lib/libalpm/package.c:1.74 Wed Feb 21 23:42:59 2007 +++ pacman-lib/lib/libalpm/package.c Thu Feb 22 21:10:56 2007 @@ -141,27 +141,29 @@ } /* compare versions and see if we need to upgrade */ - cmp = _alpm_versioncmp(local_pkg->version, pkg->version); + cmp = _alpm_versioncmp(pkg->version, local_pkg->version); if(cmp != 0 && pkg->force) { cmp = 1; _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s"), local_pkg->name, pkg->version); - } else if(cmp > 0) { + } else if(cmp < 0) { /* local version is newer */ pmdb_t *db = pkg->data; _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), local_pkg->name, local_pkg->version, db->treename, pkg->version); cmp = 0; - } else if(cmp < 0) { + } else if(cmp > 0) { /* we have an upgrade, make sure we should actually do it */ if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local_pkg->name, local_pkg->version, pkg->version); + cmp = 0; } else if(_alpm_pkg_istoonew(pkg)) { /* package too new (UpgradeDelay) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"), local_pkg->name, local_pkg->version, pkg->version); + cmp = 0; } } Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.31 pacman-lib/lib/libalpm/package.h:1.32 --- pacman-lib/lib/libalpm/package.h:1.31 Sun Feb 18 17:07:11 2007 +++ pacman-lib/lib/libalpm/package.h Thu Feb 22 21:10:56 2007 @@ -102,7 +102,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(void *data); int _alpm_pkg_cmp(const void *p1, const void *p2); -int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB); +int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(char *pkgfile); pmpkg_t *_alpm_pkg_isin(char *needle, alpm_list_t *haystack); int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.102 pacman-lib/lib/libalpm/sync.c:1.103 --- pacman-lib/lib/libalpm/sync.c:1.102 Wed Feb 21 01:44:15 2007 +++ pacman-lib/lib/libalpm/sync.c Thu Feb 22 21:10:56 2007 @@ -228,24 +228,19 @@ /* compare versions and see if we need to upgrade */ if(alpm_pkg_compare_versions(local, spkg)) { - if(alpm_list_find_str(handle->ignorepkg, local->name)) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s => %s)"), - local->name, local->version, local->version, spkg->version); - } else { - _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), - local->name, local->version, local->version, spkg->version); - if(!find_pkginsync(spkg->name, trans->packages)) { - pmpkg_t *dummy = _alpm_pkg_new(local->name, local->version); - if(dummy == NULL) { - goto error; - } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); - if(sync == NULL) { - FREEPKG(dummy); - goto error; - } - trans->packages = alpm_list_add(trans->packages, sync); + _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), + local->name, local->version, local->version, spkg->version); + if(!find_pkginsync(spkg->name, trans->packages)) { + pmpkg_t *dummy = _alpm_pkg_new(local->name, local->version); + if(dummy == NULL) { + goto error; } + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + if(sync == NULL) { + FREEPKG(dummy); + goto error; + } + trans->packages = alpm_list_add(trans->packages, sync); } } } @@ -331,10 +326,17 @@ if(alpm_pkg_compare_versions(local, spkg) == 0) { /* spkg is NOT an upgrade, get confirmation before adding */ int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); - if(!resp) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), local->name, local->version); - return(0); + if(alpm_list_find_str(handle->ignorepkg, local->name)) { + QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); + if(!resp) { + return(0); + } + } else { + QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); + if(!resp) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), local->name, local->version); + return(0); + } } } } Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.3 pacman-lib/pactest/pactest.py:1.4 --- pacman-lib/pactest/pactest.py:1.3 Thu Feb 22 03:06:54 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 21:10:56 2007 @@ -34,6 +34,7 @@ def globTests(option, opt_str, value, parser): globlist = [] globlist.extend(glob.glob(value)) + print "globlist=%s" % globlist setattr(parser.values, option.dest, globlist) def createOptParser(): Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.38 pacman-lib/src/pacman/trans.c:1.39 --- pacman-lib/src/pacman/trans.c:1.38 Wed Feb 21 23:46:34 2007 +++ pacman-lib/src/pacman/trans.c Thu Feb 22 21:10:56 2007 @@ -167,11 +167,15 @@ } else { *response = 0; } - } else { + } else if(data2) { snprintf(str, LOG_STR_LEN, _(":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "), alpm_pkg_get_name(data1), alpm_pkg_get_name(data2)); *response = yesno(str); + } else { + snprintf(str, LOG_STR_LEN, _(":: %s is in IgnorePkg. Install anyway? [Y/n] "), + alpm_pkg_get_name(data1)); + *response = yesno(str); } break; case PM_TRANS_CONV_REMOVE_HOLDPKG:

1 0

[pacman-dev] CVS update of pacman-lib (4 files)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 21:00:30 Author: dan Path: /home/cvs-pacman/pacman-lib Added: contrib/Makefile.am (1.1) Modified: .cvsignore (1.5 -> 1.6) Makefile.am (1.15 -> 1.16) configure.ac (1.34 -> 1.35) * Updated distcheck target- added some flags so pactest is 100% correct. * Added a Makefile.am so contrib/ folder is included in dist. ---------------------+ .cvsignore | 1 + Makefile.am | 5 +++-- configure.ac | 1 + contrib/Makefile.am | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.5 pacman-lib/.cvsignore:1.6 --- pacman-lib/.cvsignore:1.5 Sat Feb 17 03:55:05 2007 +++ pacman-lib/.cvsignore Thu Feb 22 21:00:30 2007 @@ -20,3 +20,4 @@ tags cscope.out +pacman-*.tar.gz Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.15 pacman-lib/Makefile.am:1.16 --- pacman-lib/Makefile.am:1.15 Thu Feb 22 16:34:51 2007 +++ pacman-lib/Makefile.am Thu Feb 22 21:00:30 2007 @@ -1,8 +1,9 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest +SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib + +DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README -# TODO: move translation-help to ABOUT-NLS? EXTRA_DIST = HACKING # TODO : figure out a way to get 'make distcheck' to build with Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.34 pacman-lib/configure.ac:1.35 --- pacman-lib/configure.ac:1.34 Thu Feb 22 16:34:51 2007 +++ pacman-lib/configure.ac Thu Feb 22 21:00:30 2007 @@ -220,6 +220,7 @@ etc/pacman.d/mirrorlist etc/abs/Makefile pactest/Makefile +contrib/Makefile Makefile ]) Index: pacman-lib/contrib/Makefile.am diff -u /dev/null pacman-lib/contrib/Makefile.am:1.1 --- /dev/null Thu Feb 22 21:00:30 2007 +++ pacman-lib/contrib/Makefile.am Thu Feb 22 21:00:30 2007 @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + bash_completion \ + pacsearch \ + zsh_completion +

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 20:29:15 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.4 -> 1.5) * Prepend all lists with _ for consistency * Fixed IFS. It seems there's no easy way to get a newline IFS without setting it like so: IFS=" " #ewww gross ----------+ repo-add | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.4 pacman-lib/scripts/repo-add:1.5 --- pacman-lib/scripts/repo-add:1.4 Tue Jan 30 19:38:13 2007 +++ pacman-lib/scripts/repo-add Thu Feb 22 20:29:14 2007 @@ -94,26 +94,27 @@ packager="" csize="" size="" - groups="" - depends="" - backups="" - licenses="" + _groups="" + _depends="" + _backups="" + _licenses="" _replaces="" _provides="" _conflicts="" OLDIFS="$IFS" # IFS (field seperator) is only the newline character - IFS=$(echo) + IFS=" +" # read info from the zipped package for i in $(tar xOf "$pkgfile" .PKGINFO | grep -v "^#" |sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do eval "${i}" case "$i" in - group=*) groups="$groups $group" ;; - depend=*) depends="$depends $depend" ;; - backup=*) backups="$backups $backup" ;; - license=*) licenses="$licenses $license" ;; + group=*) _groups="$_groups $group" ;; + depend=*) _depends="$_depends $depend" ;; + backup=*) _backups="$_backups $backup" ;; + license=*) _licenses="$_licenses $license" ;; replaces=*) _replaces="$_replaces $replaces" ;; provides=*) _provides="$_provides $provides" ;; conflicts=*) _conflicts="$_conflicts $conflicts" ;; @@ -153,9 +154,9 @@ if [ -n "$pkgdesc" ]; then echo -e "%DESC%\n$pkgdesc\n" >>desc fi - if [ -n "$groups" ]; then + if [ -n "$_groups" ]; then echo "%GROUPS%" >>desc - echo $groups | tr -s ' ' '\n' >>desc + echo $_groups | tr -s ' ' '\n' >>desc echo "" >desc fi [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc @@ -171,9 +172,9 @@ done [ -n "$url" ] && echo -e "%URL%\n$url\n" >>desc - if [ -n "$licenses" ]; then + if [ -n "$_licenses" ]; then echo "%LICENSE%" >>desc - echo $licenses | tr -s ' ' '\n' >>desc + echo $_licenses | tr -s ' ' '\n' >>desc echo "" >>desc fi [ -n "$arch" ] && echo -e "%ARCH%\n$arch\n" >>desc @@ -189,9 +190,9 @@ # create depends entry echo ":: creating 'depends' db entry" - if [ -n "$depends" ]; then + if [ -n "$_depends" ]; then echo "%DEPENDS%" >>depends - echo $depends | tr -s ' ' '\n' >>depends + echo $_depends | tr -s ' ' '\n' >>depends echo "" >>depends fi if [ -n "$_conflicts" ]; then

1 0

[pacman-dev] CVS update of pacman-lib (20 files)
by dan＠archlinux.org 22 Feb '07

22 Feb '07

Date: Thursday, February 22, 2007 @ 16:34:52 Author: dan Path: /home/cvs-pacman/pacman-lib Added: pactest/Makefile.am (1.1) Modified: Makefile.am (1.14 -> 1.15) autoclean.sh (1.9 -> 1.10) configure.ac (1.33 -> 1.34) doc/Makefile.am (1.14 -> 1.15) etc/Makefile.am (1.2 -> 1.3) etc/pacman.d/Makefile.am (1.6 -> 1.7) lib/libalpm/Makefile.am (1.17 -> 1.18) lib/libalpm/po/de.po (1.8 -> 1.9) lib/libalpm/po/fr.po (1.4 -> 1.5) lib/libalpm/po/hu.po (1.4 -> 1.5) lib/libalpm/po/it.po (1.8 -> 1.9) lib/libalpm/po/pt_BR.po (1.3 -> 1.4) scripts/Makefile.am (1.5 -> 1.6) src/pacman/pacman.c (1.99 -> 1.100) src/pacman/po/de.po (1.9 -> 1.10) src/pacman/po/fr.po (1.4 -> 1.5) src/pacman/po/hu.po (1.4 -> 1.5) src/pacman/po/it.po (1.8 -> 1.9) src/pacman/po/pt_BR.po (1.5 -> 1.6) Big commit here, I'll try to cover all the bases. * Updated all of the language files, as the POT file was updated. NOTE FOR TRANSLATORS, try to base your next contribution off of these, notice how some msgids and messages have been wrapped to the next line- it makes it easier to read anyway. * More Makefile.am/configure.ac updates. 'make dist' and 'make distclean' now work properly, with only one caveat- the automatic testing in distclean doesn't do so hot as it is compiled with a default configure, which includes the fakeroot-proof code (which does not cooperate with pactest). * Added a Makefile.am for the pactest directory. --------------------------+ Makefile.am | 10 autoclean.sh | 2 configure.ac | 120 +++++----- doc/Makefile.am | 2 etc/Makefile.am | 1 etc/pacman.d/Makefile.am | 2 lib/libalpm/Makefile.am | 2 lib/libalpm/po/de.po | 24 +- lib/libalpm/po/fr.po | 526 +++++++++++++++++++++++++-------------------- lib/libalpm/po/hu.po | 522 +++++++++++++++++++++++++------------------- lib/libalpm/po/it.po | 2 lib/libalpm/po/pt_BR.po | 477 ++++++++++++++++++++++------------------ pactest/Makefile.am | 15 + scripts/Makefile.am | 6 src/pacman/pacman.c | 2 src/pacman/po/de.po | 45 ++- src/pacman/po/fr.po | 173 ++++++++------ src/pacman/po/hu.po | 173 ++++++++------ src/pacman/po/it.po | 6 src/pacman/po/pt_BR.po | 178 ++++++++------- 20 files changed, 1295 insertions(+), 993 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] make dist targets
by Dan McGee 22 Feb '07

22 Feb '07

I tried something new today: make dist-gzip which should give us a gzipped archive of the code, perfect for the release. Not so perfect was its non-inclusion of most of our C header files, with the exception of alpm.h and alpm_list.h. If anyone is good with automake and knows what needs to be done to get the rest to be included (without exporting these headers to system include directories), go for it. -Dan

1 1