- Pacman-dev - lists.archlinux.org

[pacman-dev] [patch] Modified info query so unknown attributes are not shown
by Dan McGee 27 Jan '07

27 Jan '07

(Patched on my local tree, so it may not line up perfectly, but it is very straightforward.) * Modified info query so it doesn't show more than available when querying a package file. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> # # old_revision [6ed5dfeba6a29ca2c5158f88f2d76b21fc8938f3] # # patch "src/pacman/package.c" # from [1c53121b062b4ee21f6b372e5e3ffbceb3b2b36f] # to [d935dbb664984fa0b60ea08b3132946f49be2214] # ============================================================ --- src/pacman/package.c 1c53121b062b4ee21f6b372e5e3ffbceb3b2b36f +++ src/pacman/package.c d935dbb664984fa0b60ea08b3132946f49be2214 @@ -34,6 +34,10 @@ #include "package.h" /* Display the content of an installed package + * + * level: <1 - omits N/A info for file query (-Qp) + * 1 - normal level + * >1 - extra information (backup files) */ void dump_pkg_full(pmpkg_t *pkg, int level) { @@ -69,26 +73,26 @@ void dump_pkg_full(pmpkg_t *pkg, int lev list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - /* TODO only applicable if querying installed package, not a file */ - list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + if(level > 0) { /* Only applicable if installed package */ + list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + } list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); - /* TODO only applicable if querying installed package, not a file */ - printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + if(level > 0) { + printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + printf(_("Install Reason : %s\n"), reason); + } printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); - printf(_("Reason : %s\n"), reason); - /* TODO only applicable if querying installed package, not a file */ printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); printf("\n"); /* Print additional package info if info flag passed more than once */ - /* TODO only applicable if querying installed package, not a file */ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg);

1 0

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

26 Jan '07

Date: Thursday, January 25, 2007 @ 21:19:24 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.7 -> 1.8) Missed that 8) ----------------+ downloadprog.c | 1 - 1 file changed, 1 deletion(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.7 pacman-lib/src/pacman/downloadprog.c:1.8 --- pacman-lib/src/pacman/downloadprog.c:1.7 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/downloadprog.c Thu Jan 25 21:19:24 2007 @@ -56,7 +56,6 @@ /* a little hard to conceal easter eggs in open-source software, * but they're still fun. ;) */ const unsigned short chomp = alpm_option_get_chomp(); - unsigned int chomp = 0; char *fname, *p; unsigned int maxcols = getcols(); unsigned int progresslen = maxcols - 57;

1 0

[pacman-dev] CVS update of pacman-lib (13 files)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 21:13:17 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: autoclean.sh (1.7 -> 1.8) configure.ac (1.22 -> 1.23) etc/pacman.d/Makefile.am (1.3 -> 1.4) lib/libalpm/Makefile.am (1.13 -> 1.14) lib/libalpm/alpm.c (1.105 -> 1.106) lib/libalpm/deps.c (1.58 -> 1.59) scripts/makeworld (1.5 -> 1.6) src/pacman/Makefile.am (1.11 -> 1.12) src/pacman/downloadprog.c (1.6 -> 1.7) src/pacman/package.c (1.23 -> 1.24) src/pacman/pacman.c (1.83 -> 1.84) src/pacman/trans.h (1.6 -> 1.7) src/pacman/util.c (1.23 -> 1.24) Dan McGee <dpmcgee(a)gmail.com> * Lots of code cleanup, and type fixes * Make 'makeworld' a bit more in-line with the other stuff * Make -Si and -Qi operations appear the same ---------------------------+ autoclean.sh | 1 + configure.ac | 26 ++++++++++---------------- etc/pacman.d/Makefile.am | 1 - lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/deps.c | 4 ++-- scripts/makeworld | 12 ++++++------ src/pacman/Makefile.am | 4 ++-- src/pacman/downloadprog.c | 6 +++--- src/pacman/package.c | 22 +++++++++++----------- src/pacman/pacman.c | 4 ++-- src/pacman/trans.h | 1 + src/pacman/util.c | 2 +- 13 files changed, 42 insertions(+), 47 deletions(-) Index: pacman-lib/autoclean.sh diff -u pacman-lib/autoclean.sh:1.7 pacman-lib/autoclean.sh:1.8 --- pacman-lib/autoclean.sh:1.7 Tue Dec 19 02:58:29 2006 +++ pacman-lib/autoclean.sh Thu Jan 25 21:13:16 2007 @@ -36,6 +36,7 @@ rm -rf etc/Makefile rm -rf etc/pacman.d/Makefile.in rm -rf etc/pacman.d/Makefile +rm -rf etc/pacman.d/{current,extra,community,unstable,release} rm -rf etc/abs/Makefile.in rm -rf etc/abs/Makefile Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.22 pacman-lib/configure.ac:1.23 --- pacman-lib/configure.ac:1.22 Thu Jan 11 12:34:51 2007 +++ pacman-lib/configure.ac Thu Jan 25 21:13:16 2007 @@ -147,7 +147,7 @@ dnl Help line for debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([ --enable-debug], [Enable debugging support]), + AC_HELP_STRING([--enable-debug], [Enable debugging support]), [debug=$enableval], [debug=yes]) dnl Help line for fakeroot @@ -292,26 +292,20 @@ fi dnl Check for math -AC_CHECK_LIB([m], [log10], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) -if test -n "$LIBM"; then - LDFLAGS="$LDFLAGS $LIBM" -else - AC_MSG_ERROR("math library not found!"); +AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) +if test -z "$LIBM"; then + AC_MSG_ERROR("math library needed to compile pacman!"); fi dnl Check for libarchive AC_CHECK_LIB([archive], [archive_read_data], [AC_CHECK_HEADER([archive.h], [LIBARCHIVE='-larchive'])]) -if test -n "$LIBARCHIVE"; then - LDFLAGS="$LDFLAGS $LIBARCHIVE" -else +if test -z "$LIBARCHIVE"; then AC_MSG_ERROR("libarchive is needed to compile pacman!"); fi dnl Check for libdownload AC_CHECK_LIB([download], [downloadParseURL], [AC_CHECK_HEADER([download.h], [LIBDOWNLOAD='-ldownload'])]) -if test -n "$LIBDOWNLOAD"; then - LDFLAGS="$LDFLAGS $LIBDOWNLOAD" -else +if test -z "$LIBDOWNLOAD"; then AC_MSG_ERROR("libdownload is needed to compile pacman!"); fi @@ -326,20 +320,20 @@ dnl Enable or disable debug code AC_MSG_CHECKING(for debug mode request) -if test x$debug = xyes ; then - AM_CONDITIONAL(PACMAN_DEBUG, test x$debug = xyes) +if test "$debug" = "yes" ; then + AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "yes") CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG" LDFLAGS="$LDFLAGS -lmcheck" AC_MSG_RESULT(yes) else - AM_CONDITIONAL(PACMAN_DEBUG, test x$debug = xno) + AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "no") CFLAGS="$CFLAGS -Wall -std=c99" AC_MSG_RESULT(no) fi dnl Enable or disable fakeroot code AC_MSG_CHECKING(for fakeroot proof support) -if test x$fakeroot = xyes ; then +if test "$fakeroot" = "yes" ; then AC_MSG_RESULT(yes) else CFLAGS="$CFLAGS -DFAKEROOT" Index: pacman-lib/etc/pacman.d/Makefile.am diff -u pacman-lib/etc/pacman.d/Makefile.am:1.3 pacman-lib/etc/pacman.d/Makefile.am:1.4 --- pacman-lib/etc/pacman.d/Makefile.am:1.3 Tue Jan 16 22:40:09 2007 +++ pacman-lib/etc/pacman.d/Makefile.am Thu Jan 25 21:13:16 2007 @@ -1,7 +1,6 @@ EXTRA_DIST = community current extra release unstable clean: - rm $(EXTRA_DIST) install-data-hook: mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \ Index: pacman-lib/lib/libalpm/Makefile.am diff -u pacman-lib/lib/libalpm/Makefile.am:1.13 pacman-lib/lib/libalpm/Makefile.am:1.14 --- pacman-lib/lib/libalpm/Makefile.am:1.13 Fri Jan 19 04:28:44 2007 +++ pacman-lib/lib/libalpm/Makefile.am Thu Jan 25 21:13:16 2007 @@ -40,7 +40,7 @@ libalpm_la_SOURCES = $(TARGETS) libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) -libalpm_la_LIBADD = -larchive -ldownload +libalpm_la_LIBADD = -larchive -ldownload -lm if HAS_DOXYGEN all: doxygen.in Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.105 pacman-lib/lib/libalpm/alpm.c:1.106 --- pacman-lib/lib/libalpm/alpm.c:1.105 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/alpm.c Thu Jan 25 21:13:16 2007 @@ -566,7 +566,7 @@ * and * package-name-bar-1.2.3-1 */ - int i = 0; + size_t i = 0; char *arch, *cmp, *p; if((p = strrchr(pkgname, '-'))) { @@ -1008,7 +1008,7 @@ _alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr); } else if (!strcmp(key, "UPGRADEDELAY")) { /* The config value is in days, we use seconds */ - long ud = atol(ptr) * 60 * 60 *24; + time_t ud = atol(ptr) * 60 * 60 *24; alpm_option_set_upgradedelay(ud); _alpm_log(PM_LOG_DEBUG, _("config: upgradedelay: %d"), ud); } else { Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.58 pacman-lib/lib/libalpm/deps.c:1.59 --- pacman-lib/lib/libalpm/deps.c:1.58 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/deps.c Thu Jan 25 21:13:16 2007 @@ -249,9 +249,9 @@ } if(!_alpm_depcmp(tp, &depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), - depend.name, p->name); + depend.name, p->name); miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, - depend.name, depend.version); + depend.name, depend.version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.5 pacman-lib/scripts/makeworld:1.6 --- pacman-lib/scripts/makeworld:1.5 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/makeworld Thu Jan 25 21:13:16 2007 @@ -20,8 +20,8 @@ # USA. # -version="2.9.8" -toplevel=`pwd` +version="3.0.0" +toplevel=$(pwd) usage() { echo "makeworld version $version" @@ -119,13 +119,13 @@ # convert a (possibly) relative path to absolute cd $dest -dest=`pwd` +dest=$(pwd) cd - &>/dev/null -sd=`date +"[%b %d %H:%M]"` +sd=$(date +"[%b %d %H:%M]") for category in $*; do - for port in `find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort`; do + for port in $(find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort); do cd $port if [ -f PKGBUILD ]; then . PKGBUILD @@ -138,7 +138,7 @@ buildstatus=1 fi fi - d=`date +"[%b %d %H:%M]"` + d=$(date +"[%b %d %H:%M]") echo -n "$d " >>$toplevel/build.log case $buildstatus in 0) echo "$pkgname already built -- skipping" >>$toplevel/build.log ;; Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.11 pacman-lib/src/pacman/Makefile.am:1.12 --- pacman-lib/src/pacman/Makefile.am:1.11 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/Makefile.am Thu Jan 25 21:13:16 2007 @@ -17,9 +17,9 @@ pacman_static_SOURCES = $(pacman_SOURCES) pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \ - -ldownload -lm -lalpm + -ldownload -lalpm pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \ - -ldownload -lm -lalpm + -ldownload -lalpm pacman_static_LDFLAGS = $(LDFLAGS) -all-static Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.6 pacman-lib/src/pacman/downloadprog.c:1.7 --- pacman-lib/src/pacman/downloadprog.c:1.6 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/downloadprog.c Thu Jan 25 21:13:16 2007 @@ -53,6 +53,9 @@ { static unsigned int lasthash = 0, mouth = 0; unsigned int i, hash; + /* a little hard to conceal easter eggs in open-source software, + * but they're still fun. ;) */ + const unsigned short chomp = alpm_option_get_chomp(); unsigned int chomp = 0; char *fname, *p; unsigned int maxcols = getcols(); @@ -75,9 +78,6 @@ return; } - /* a little hard to conceal easter eggs in open-source software, but they're still fun. ;) */ - chomp = alpm_option_get_chomp(); - gettimeofday(&current_time, NULL); total_timediff = current_time.tv_sec-initial_time.tv_sec + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000; Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.23 pacman-lib/src/pacman/package.c:1.24 --- pacman-lib/src/pacman/package.c:1.23 Mon Jan 22 03:52:18 2007 +++ pacman-lib/src/pacman/package.c Thu Jan 25 21:13:16 2007 @@ -63,24 +63,24 @@ /* actual output */ printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("URL : %s\n"), (char *)alpm_pkg_get_url(pkg)); list_display(_("License :"), alpm_pkg_get_licenses(pkg)); + list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); + list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); + list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); + list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); + /* TODO only applicable if querying installed package, not a file */ + list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); + printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); + printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); - printf(_("Installed Size : %ld\n"), (long int)alpm_pkg_get_size(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); /* TODO only applicable if querying installed package, not a file */ printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); printf(_("Reason : %s\n"), reason); - list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); - list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - /* TODO only applicable if querying installed package, not a file */ - list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); - list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); @@ -117,8 +117,8 @@ list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); - printf(_("Download Size : %ld\n"), (long)alpm_pkg_get_size(pkg)); - printf(_("Installed Size : %ld\n"), (long)alpm_pkg_get_isize(pkg)); + printf(_("Download Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); + printf(_("Installed Size : %6.2f K\n"), (float)alpm_pkg_get_isize(pkg) / 1024.0); printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.83 pacman-lib/src/pacman/pacman.c:1.84 --- pacman-lib/src/pacman/pacman.c:1.83 Wed Jan 24 11:57:19 2007 +++ pacman-lib/src/pacman/pacman.c Thu Jan 25 21:13:16 2007 @@ -121,8 +121,8 @@ printf(_("usage: %s {-Q --query} [options] [package]\n"), myname); printf(_("options:\n")); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -e, --orphans list all packages that were installed as a dependency\n")); - printf(_(" and are not required by any other packages\n")); + printf(_(" -e, --orphans list all packages installed as dependencies but no longer\n")); + printf(_(" required by any package\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information\n")); printf(_(" -l, --list list the contents of the queried package\n")); Index: pacman-lib/src/pacman/trans.h diff -u pacman-lib/src/pacman/trans.h:1.6 pacman-lib/src/pacman/trans.h:1.7 --- pacman-lib/src/pacman/trans.h:1.6 Tue Jan 23 22:02:55 2007 +++ pacman-lib/src/pacman/trans.h Thu Jan 25 21:13:16 2007 @@ -28,6 +28,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, void *data3, int *response); +/* callback to handle display of the progress bar for transactions */ void cb_trans_progress(pmtransprog_t event, char *pkgname, int percent, int howmany, int remain); Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.23 pacman-lib/src/pacman/util.c:1.24 --- pacman-lib/src/pacman/util.c:1.23 Wed Jan 24 11:57:19 2007 +++ pacman-lib/src/pacman/util.c Thu Jan 25 21:13:16 2007 @@ -167,7 +167,7 @@ while(*p) { if(*p == ' ') { const char *next = NULL; - int len; + unsigned int len; p++; if(p == NULL || *p == ' ') continue; next = strchr(p, ' ');

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.8.in)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:57:06 Author: aaron Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.8.in (1.9 -> 1.10) Forgot this patch from Dan McGee as part of the bug #5409 fixes -------------+ pacman.8.in | 3 +++ 1 file changed, 3 insertions(+) Index: pacman-lib/doc/pacman.8.in diff -u pacman-lib/doc/pacman.8.in:1.9 pacman-lib/doc/pacman.8.in:1.10 --- pacman-lib/doc/pacman.8.in:1.9 Tue Dec 5 02:38:34 2006 +++ pacman-lib/doc/pacman.8.in Thu Jan 25 20:57:06 2007 @@ -305,6 +305,9 @@ follow a URL naming structure. Currently only ftp is supported for remote servers. If you want to use a local directory, you can specify the full path with a 'file://' prefix, as shown above. +The order of repositories in the file matters; repositories listed first will +take precidence over those listed later in the file when packages in two +repositories have identical names, regardless of version number. .SH USING YOUR OWN REPOSITORY Let's say you have a bunch of custom packages in \fI/home/pkgs\fP and their respective PKGBUILD files are all in \fI/var/abs/local\fP. All you need to do is generate a compressed package database

1 0

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

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:34:27 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: trans.c (1.28 -> 1.29) * copy and paste error, "resolving deps" -> "cleaning up" Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> ---------+ trans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.28 pacman-lib/src/pacman/trans.c:1.29 --- pacman-lib/src/pacman/trans.c:1.28 Tue Jan 23 22:02:55 2007 +++ pacman-lib/src/pacman/trans.c Thu Jan 25 20:34:26 2007 @@ -60,7 +60,7 @@ } break; case PM_TRANS_EVT_CLEANUP_START: - pm_fprintf(stderr, NL, _("resolving dependencies... ")); + pm_fprintf(stderr, NL, _("cleaning up... ")); break; case PM_TRANS_EVT_RESOLVEDEPS_START: pm_fprintf(stderr, NL, _("resolving dependencies... "));

1 0

[pacman-dev] CVS update of pacman-lib (etc/pacman.conf.in lib/libalpm/util.c)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:33:03 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.conf.in (1.3 -> 1.4) lib/libalpm/util.c (1.40 -> 1.41) * Fix FS #3107- Use ISO date style * Fix FS #5409- document that pacman.conf repo ordering is important Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> --------------------+ etc/pacman.conf.in | 4 +++- lib/libalpm/util.c | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) Index: pacman-lib/etc/pacman.conf.in diff -u pacman-lib/etc/pacman.conf.in:1.3 pacman-lib/etc/pacman.conf.in:1.4 --- pacman-lib/etc/pacman.conf.in:1.3 Thu Dec 21 12:51:50 2006 +++ pacman-lib/etc/pacman.conf.in Thu Jan 25 20:33:03 2007 @@ -21,7 +21,9 @@ # - can be defined here or included from another file # - pacman will search repositories in the order defined here # - local/custom mirrors can be added here or in separate files - +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# #[testing] #Server = ftp://ftp.archlinux.org/testing/os/i686 Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.40 pacman-lib/lib/libalpm/util.c:1.41 --- pacman-lib/lib/libalpm/util.c:1.40 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/util.c Thu Jan 25 20:33:03 2007 @@ -357,10 +357,11 @@ t = time(NULL); tm = localtime(&t); - fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n", - tm->tm_mon+1, tm->tm_mday, tm->tm_year-100, - tm->tm_hour, tm->tm_min, - str); + /* Use ISO-8601 date format */ + fprintf(f, "[%04d-%02d-%02d %02d:%02d] %s\n", + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min, str); + fflush(f); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:26:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.34 -> 1.35) James Rosten <seinfeld90 at gmail.com> * Use PKGDEST and SRCDEST from the environment (if defined) when calling makepkg ---------+ makepkg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.34 pacman-lib/scripts/makepkg:1.35 --- pacman-lib/scripts/makepkg:1.34 Tue Jan 23 11:02:37 2007 +++ pacman-lib/scripts/makepkg Thu Jan 25 20:26:08 2007 @@ -27,7 +27,6 @@ myver='3.0.0' startdir=$(pwd) -PKGDEST=$startdir BUILDSCRIPT="PKGBUILD" PKGEXT="pkg.tar.gz" @@ -314,6 +313,11 @@ ARGLIST=$@ +#preserve environment variables +PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined +_PKGDEST=${PKGDEST} +_SRCDEST=$SRCDEST + #Source makepkg.conf; fail if it is not found if [ -f /etc/makepkg.conf ]; then source /etc/makepkg.conf @@ -327,6 +331,10 @@ source ~/.makepkg.conf fi +# override settings with an environment variable for batch processing +PKGDEST=${_PKGDEST:-$PKGDEST} +SRCDEST=${_SRCDEST:-$SRCDEST} + while [ "$#" -ne "0" ]; do case $1 in # pacman

1 0

[pacman-dev] Dead bugs
by Dan McGee 25 Jan '07

25 Jan '07

Someone with the proper permissions, I found these on the bugtracker today and they seem to be old, outdated, or otherwise unnecessary: FS#4036 — file can't recognize python 2.4 byte-code - It can now FS#5009 — pacman-optimize makes errnous fs assumptions - Didn't Jaime fix this with his recent rewrite? FS#5555 — pacman -Scc is slow -Quote from bug report - "sorry that I couldn't come up with something better, but I just had to get #5555 ;)" -Good luck speeding it up- I think it just removes the directory and recreates it -Dan

2 1

[pacman-dev] [patch] Fix FS #3107 (Use ISO style dates), FS #5409 (document pacman.conf order is relevent)
by Dan McGee 25 Jan '07

25 Jan '07

* Fix FS #3107- Use ISO date style * Fix FS #5409- document that pacman.conf repo ordering is important Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> ============================================================ --- doc/pacman.8.in 3143c0f4de3cd5ca7ddbf100690e91a8d3d7f7b6 +++ doc/pacman.8.in e9a8f44c7a2ced2b3594bd41a6f60dd1a026a144 @@ -305,6 +305,9 @@ shown above. follow a URL naming structure. Currently only ftp is supported for remote servers. If you want to use a local directory, you can specify the full path with a 'file://' prefix, as shown above. +The order of repositories in the file matters; repositories listed first will +take precidence over those listed later in the file when packages in two +repositories have identical names, regardless of version number. .SH USING YOUR OWN REPOSITORY Let's say you have a bunch of custom packages in \fI/home/pkgs\fP and their respective PKGBUILD files are all in \fI/var/abs/local\fP. All you need to do is generate a compressed package database ============================================================ --- etc/pacman.conf.in f0a4dc45658de05f03658969dc81136801736229 +++ etc/pacman.conf.in de8076ec76dd59832b10616c782e471e2d1d5ed7 @@ -21,6 +21,8 @@ HoldPkg = pacman glibc # - can be defined here or included from another file # - pacman will search repositories in the order defined here # - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number #[testing] #Server = ftp://ftp.archlinux.org/testing/os/i686 ============================================================ --- lib/libalpm/util.c 1749c1006346422efcc2257de4ff96e74ebc9336 +++ lib/libalpm/util.c 0a2ce942c427b52148f0dfab02a3c3dd5cc15b67 @@ -357,10 +357,10 @@ int _alpm_logaction(unsigned short usesy t = time(NULL); tm = localtime(&t); - fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n", - tm->tm_mon+1, tm->tm_mday, tm->tm_year-100, - tm->tm_hour, tm->tm_min, - str); + /* Use ISO-8601 date format */ + fprintf(f, "[%04d-%02d-%02d %02d:%02d] %s\n", + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min, str); fflush(f); }

1 0

[pacman-dev] [psuedo-patch] First attempt at FS#3492 and fix a copy-paste error
by Dan McGee 25 Jan '07

25 Jan '07

If you are interested in fixing this bug, let me know. Otherwise I'm going to put this on the back burner for a bit and hopefully get back to it later. If you do want to work on it and have questions, shoot me an email or talk to me on IRC when I'm on (as toofishes). * start to fixing FS #3492, fixed typecasts, clarified actions, added notes to code but not actual removal code that is necessary, as I'm not sure what the best plan of action is. * copy and paste error, "resolving deps" -> "cleaning up" Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> # # old_revision [8b849d94fb042fa6b42cad8ff6938fe27406dadb] # # patch "lib/libalpm/add.c" # from [5340d7f7768bf9d8ec37b907a422350c510c8f39] # to [2e8010675af78d63c5f57b2eb7c71b0f4a2db455] # # patch "src/pacman/trans.c" # from [1f02954b56601d065e49e0c52c92e3af395c65fd] # to [41d5b28cb0602a8b59368da1b5b3ef1874048af1] # ============================================================ --- lib/libalpm/add.c 5340d7f7768bf9d8ec37b907a422350c510c8f39 +++ lib/libalpm/add.c 2e8010675af78d63c5f57b2eb7c71b0f4a2db455 @@ -210,10 +210,9 @@ error: return(-1); } - -static int name_cmp(const void *p1, const void *p2) +static int pkg_cmp(const void *p1, const void *p2) { - return(strcmp(((pmpkg_t *)p1)->name, (const char *)p2)); + return(strcmp(((pmdepmissing_t *)p1)->target, ((pmdepmissing_t *)p2)->target)); } int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) @@ -253,11 +252,26 @@ int _alpm_add_prepare(pmtrans_t *trans, /* Attempt to resolve conflicts */ QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this); if(skip_this) { - pmpkg_t **pkg = NULL; - lp = alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)pkg); - FREEPKG(*pkg); + pmdepmissing_t *pkg = NULL; + lp = alpm_list_remove(lp, (void *)miss, pkg_cmp, (void*)&pkg); + /* TODO: We remove the conflict from the list but never actually remove + * the package. Need to do this to fix FS #3492. The sync code should + * provide an example of how to do this, as it handles replaces and + * removes. We run into problems because we do a file conflict check + * below and it fails there. A force flag will skip that part, but + * still not remove the original package designated here for removal. + * Better yet, dump all this shitty duplicate code and somehow combine + * it with the sync code. */ + FREE(pkg); + if(lp == NULL) { + break; + } } } + /* Removal code should go here, as described above. Instead of simply + * removing items, perhaps throw them in another list to be removed, then + * proceed as sync.c would? I'm not sure because I'm not familiar enough + * with the codebase. */ if(lp != NULL) { if(data) { *data = lp; @@ -283,8 +297,10 @@ int _alpm_add_prepare(pmtrans_t *trans, _alpm_log(PM_LOG_FLOW1, _("cleaning up")); for (lp=trans->packages; lp!=NULL; lp=lp->next) { info=(pmpkg_t *)lp->data; + fprintf(stderr, "package: %s %s\n", info->name, info->version); /* DEBUG */ for (rmlist=info->removes; rmlist!=NULL; rmlist=rmlist->next) { snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data); + fprintf(stderr, " removing %s\n", rm_fname); /* DEBUG */ remove(rm_fname); } } ============================================================ --- src/pacman/trans.c 1f02954b56601d065e49e0c52c92e3af395c65fd +++ src/pacman/trans.c 41d5b28cb0602a8b59368da1b5b3ef1874048af1 @@ -60,7 +60,7 @@ void cb_trans_evt(pmtransevt_t event, vo } break; case PM_TRANS_EVT_CLEANUP_START: - pm_fprintf(stderr, NL, _("resolving dependencies... ")); + pm_fprintf(stderr, NL, _("cleaning up... ")); break; case PM_TRANS_EVT_RESOLVEDEPS_START: pm_fprintf(stderr, NL, _("resolving dependencies... "));

1 0