- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] depricated spelling fix
by Roman Kyrylych 05 Apr '07

05 Apr '07

BTW, what is that .#makepkg.1.66 ? diff -uprN pacman-lib.orig/scripts/.#makepkg.1.66 pacman-lib/scripts/.#makepkg.1.66 --- pacman-lib.orig/scripts/.#makepkg.1.66 2007-04-02 18:42:06.000000000 +0300 +++ pacman-lib/scripts/.#makepkg.1.66 2007-04-05 13:21:38.000000000 +0300 @@ -123,7 +123,7 @@ check_option() { # START DEPRECATED # TODO This code should be removed in the next release of makepkg elif [ "$lc" = "no$needle" ]; then - warning "Options beginning with 'no' will be depricated in the next version of makepkg!" + warning "Options beginning with 'no' will be deprecated in the next version of makepkg!" plain "Please replace 'no' with '!': no$needle -> !$needle." echo "n" return diff -uprN pacman-lib.orig/scripts/makepkg pacman-lib/scripts/makepkg --- pacman-lib.orig/scripts/makepkg 2007-04-05 13:18:03.000000000 +0300 +++ pacman-lib/scripts/makepkg 2007-04-05 13:20:17.000000000 +0300 @@ -123,7 +123,7 @@ check_option() { # START DEPRECATED # TODO This code should be removed in the next release of makepkg elif [ "$lc" = "no$needle" ]; then - warning "Options beginning with 'no' will be depricated in the next version of makepkg!" + warning "Options beginning with 'no' will be deprecated in the next version of makepkg!" plain "Please replace 'no' with '!': no$needle -> !$needle." echo "n" return -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] ldconfig
by Nagy Gabor 04 Apr '07

04 Apr '07

Hi! I tested dpkg with my friend and we noticed that ldconfig runs when needed. This should be implemented to pacman too. Bye, Nagy Gabor PS.: We found that pacman is not definitely slower than dpkg.

5 8

[pacman-dev] CVS update of pacman-lib (NEWS)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Wednesday, April 4, 2007 @ 01:07:43 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.12 -> 1.13) * Updated ------+ NEWS | 5 +++++ 1 file changed, 5 insertions(+) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.12 pacman-lib/NEWS:1.13 --- pacman-lib/NEWS:1.12 Mon Mar 26 18:47:56 2007 +++ pacman-lib/NEWS Wed Apr 4 01:07:43 2007 @@ -1,5 +1,10 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.0.1 - fix a locale issue with tr_TR upper/lower-case conversion + - allow removal when listing the same package multiple times + - fix a repo-add bug that left a .PKGINFO file in the current + directory + - proper error messages when we cannot read mtab for freespace 3.0.0 - first release based on libalpm backend - added internationalization (gettext) support: - de, fr, hu, it, pt_BR, en_GB, ru_RU translations

1 0

[pacman-dev] CVS update of pacman-lib (configure.ac)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Wednesday, April 4, 2007 @ 01:03:52 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.37 -> 1.38) * Version number bump --------------+ configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.37 pacman-lib/configure.ac:1.38 --- pacman-lib/configure.ac:1.37 Sat Feb 24 15:25:45 2007 +++ pacman-lib/configure.ac Wed Apr 4 01:03:52 2007 @@ -3,7 +3,7 @@ AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([Pacman package manager], 3.0.0, [pacman-dev(a)archlinux.org] [pacman]) +AC_INIT([Pacman package manager], 3.0.1, [pacman-dev(a)archlinux.org] [pacman]) AC_LANG([C]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST

1 0

[pacman-dev] CVS update of pacman-lib (2 files)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Wednesday, April 4, 2007 @ 00:43:24 Author: aaron Path: /home/cvs-pacman/pacman-lib Added: pactest/tests/remove001.py (1.1) Modified: lib/libalpm/trans.c (1.45 -> 1.46) * Fix FS#6798 - there is no reason to fail on a duplicate removal target Added a pactest case for this ("-R foo foo foo foo foo" should do what is expected) ----------------------------+ lib/libalpm/trans.c | 3 ++- pactest/tests/remove001.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.45 pacman-lib/lib/libalpm/trans.c:1.46 --- pacman-lib/lib/libalpm/trans.c:1.45 Mon Mar 12 00:47:58 2007 +++ pacman-lib/lib/libalpm/trans.c Wed Apr 4 00:43:24 2007 @@ -135,7 +135,8 @@ ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); if(alpm_list_find_str(trans->targets, target)) { - RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); + return(0); + //RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } switch(trans->type) { Index: pacman-lib/pactest/tests/remove001.py diff -u /dev/null pacman-lib/pactest/tests/remove001.py:1.1 --- /dev/null Wed Apr 4 00:43:24 2007 +++ pacman-lib/pactest/tests/remove001.py Wed Apr 4 00:43:24 2007 @@ -0,0 +1,10 @@ +# If someone else can come up with a better name, please do so +self.description = "Remove a package listed 5 times" + +p = pmpkg("foo") +self.addpkg2db("local", p) + +self.args = "-R " + "foo "*5 + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXISTS=foo")

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm.c)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Tuesday, April 3, 2007 @ 23:59:36 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.127 -> 1.128) This change does two things: * Prefer case-insensitive config settings. In the future case-insensitivity may be enforced. * Provides a fix for the tr_TR locale by checking the case-insensitive version first. This is more elegant than setting the 'C' locale for tr_TR. Also added a 'RootDir' config option to match CacheDir and DBPath --------+ alpm.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.127 pacman-lib/lib/libalpm/alpm.c:1.128 --- pacman-lib/lib/libalpm/alpm.c:1.127 Sun Mar 11 17:10:03 2007 +++ pacman-lib/lib/libalpm/alpm.c Tue Apr 3 23:59:36 2007 @@ -884,6 +884,7 @@ char *ptr = NULL; char *key = NULL; int linenum = 0; + char origkey[256]; char section[256] = ""; pmdb_t *db = NULL; @@ -938,21 +939,22 @@ RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } _alpm_strtrim(key); + strncpy(origkey, key, min(255, strlen(key))); key = _alpm_strtoupper(key); if(!strlen(section) && strcmp(key, "INCLUDE")) { RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1); } if(ptr == NULL) { - if(!strcmp(key, "NOPASSIVEFTP")) { + if(strcmp(origkey, "NoPassiveFTP") == 0 || strcmp(key, "NOPASSIVEFTP") == 0) { alpm_option_set_nopassiveftp(1); _alpm_log(PM_LOG_DEBUG, _("config: nopassiveftp")); - } else if(!strcmp(key, "USESYSLOG")) { + } else if(strcmp(origkey, "UseSyslog") == 0 || strcmp(key, "USESYSLOG") == 0) { alpm_option_set_usesyslog(1); _alpm_log(PM_LOG_DEBUG, _("config: usesyslog")); - } else if(!strcmp(key, "ILOVECANDY")) { + } else if(strcmp(origkey, "ILoveCandy") == 0 || strcmp(key, "ILOVECANDY") == 0) { alpm_option_set_chomp(1); _alpm_log(PM_LOG_DEBUG, _("config: chomp")); - } else if(!strcmp(key, "USECOLOR")) { + } else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) { alpm_option_set_usecolor(1); _alpm_log(PM_LOG_DEBUG, _("config: usecolor")); } else { @@ -960,13 +962,13 @@ } } else { _alpm_strtrim(ptr); - if(!strcmp(key, "INCLUDE")) { + if(strcmp(origkey, "Include") == 0 || strcmp(key, "INCLUDE") == 0) { char conf[PATH_MAX]; strncpy(conf, ptr, PATH_MAX); _alpm_log(PM_LOG_DEBUG, _("config: including %s"), conf); alpm_parse_config(conf, callback, section); - } else if(!strcmp(section, "options")) { - if(!strcmp(key, "NOUPGRADE")) { + } else if(strcmp(section, "options") == 0) { + if(strcmp(origkey, "NoUpgrade") == 0 || strcmp(key, "NOUPGRADE") == 0) { char *p = ptr; char *q; @@ -979,7 +981,7 @@ } alpm_option_add_noupgrade(p); _alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s"), p); - } else if(!strcmp(key, "NOEXTRACT")) { + } else if(strcmp(origkey, "NoExtract") == 0 || strcmp(key, "NOEXTRACT") == 0) { char *p = ptr; char *q; @@ -992,7 +994,7 @@ } alpm_option_add_noextract(p); _alpm_log(PM_LOG_DEBUG, _("config: noextract: %s"), p); - } else if(!strcmp(key, "IGNOREPKG")) { + } else if(strcmp(origkey, "IgnorePkg") == 0 || strcmp(key, "IGNOREPKG") == 0) { char *p = ptr; char *q; @@ -1005,7 +1007,7 @@ } alpm_option_add_ignorepkg(p); _alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s"), p); - } else if(!strcmp(key, "HOLDPKG")) { + } else if(strcmp(origkey, "HoldPkg") == 0 || strcmp(key, "HOLDPKG") == 0) { char *p = ptr; char *q; @@ -1018,27 +1020,34 @@ } alpm_option_add_holdpkg(p); _alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s"), p); - } else if(!strcmp(key, "DBPATH")) { + } else if(strcmp(origkey, "DBPath") == 0 || strcmp(key, "DBPATH") == 0) { /* shave off the leading slash, if there is one */ if(*ptr == '/') { ptr++; } alpm_option_set_dbpath(ptr); _alpm_log(PM_LOG_DEBUG, _("config: dbpath: %s"), ptr); - } else if(!strcmp(key, "CACHEDIR")) { + } else if(strcmp(origkey, "CacheDir") == 0 || strcmp(key, "CACHEDIR") == 0) { /* shave off the leading slash, if there is one */ if(*ptr == '/') { ptr++; } alpm_option_set_cachedir(ptr); _alpm_log(PM_LOG_DEBUG, _("config: cachedir: %s"), ptr); - } else if (!strcmp(key, "LOGFILE")) { + } else if(strcmp(origkey, "RootDir") == 0 || strcmp(key, "ROOTDIR") == 0) { + /* shave off the leading slash, if there is one */ + if(*ptr == '/') { + ptr++; + } + alpm_option_set_root(ptr); + _alpm_log(PM_LOG_DEBUG, _("config: rootdir: %s"), ptr); + } else if (strcmp(origkey, "LogFile") == 0 || strcmp(key, "LOGFILE") == 0) { alpm_option_set_logfile(ptr); _alpm_log(PM_LOG_DEBUG, _("config: logfile: %s"), ptr); - } else if (!strcmp(key, "XFERCOMMAND")) { + } else if (strcmp(origkey, "XferCommand") == 0 || strcmp(key, "XFERCOMMAND") == 0) { alpm_option_set_xfercommand(ptr); _alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr); - } else if (!strcmp(key, "UPGRADEDELAY")) { + } else if (strcmp(origkey, "UpgradeDelay") == 0 || strcmp(key, "UPGRADEDELAY") == 0) { /* The config value is in days, we use seconds */ time_t ud = atol(ptr) * 60 * 60 *24; alpm_option_set_upgradedelay(ud); @@ -1047,7 +1056,7 @@ RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } } else { - if(!strcmp(key, "SERVER")) { + if(strcmp(origkey, "Server") == 0 || strcmp(key, "SERVER") == 0) { /* add to the list */ if(alpm_db_setserver(db, ptr) != 0) { /* pm_errno is set by alpm_db_setserver */

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Tuesday, April 3, 2007 @ 23:00:24 Author: aaron Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.7 -> 1.8) Forgot the @@REPO@@ part of the russian mirror. ---------------+ mirrorlist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.7 pacman-lib/etc/pacman.d/mirrorlist.in:1.8 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.7 Tue Apr 3 22:19:37 2007 +++ pacman-lib/etc/pacman.d/mirrorlist.in Tue Apr 3 23:00:24 2007 @@ -53,7 +53,7 @@ # - Romania Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@ # - Russia -Server = http://archlinux.freeside.ru/ +Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@ # - Sweden Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by Aaron Griffin 04 Apr '07

04 Apr '07

Date: Tuesday, April 3, 2007 @ 22:19:37 Author: aaron Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.6 -> 1.7) Added new Russian mirror ---------------+ mirrorlist.in | 2 ++ 1 file changed, 2 insertions(+) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.6 pacman-lib/etc/pacman.d/mirrorlist.in:1.7 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.6 Fri Mar 23 13:48:05 2007 +++ pacman-lib/etc/pacman.d/mirrorlist.in Tue Apr 3 22:19:37 2007 @@ -52,6 +52,8 @@ Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@ # - Romania Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@ +# - Russia +Server = http://archlinux.freeside.ru/ # - Sweden Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@

1 0

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

04 Apr '07

Date: Tuesday, April 3, 2007 @ 22:03:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.66 -> 1.67) * Tom Killian <tom(a)archlinux.org> Properly align checksums on makepkg -g ---------+ makepkg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.66 pacman-lib/scripts/makepkg:1.67 --- pacman-lib/scripts/makepkg:1.66 Thu Mar 29 23:24:09 2007 +++ pacman-lib/scripts/makepkg Tue Apr 3 22:03:44 2007 @@ -746,7 +746,11 @@ if [ $ct -eq 0 ]; then echo -n "${integrity_name}s=(" else - echo -ne "\t " + indent=0 + while [ $indent -lt $((${#integrity_name}+3)) ]; do + echo -n " " + indent=$(($indent+1)) + done fi echo -n "'$sum'" ct=$(($ct+1))

1 0

[pacman-dev] Replaces questions on query
by Dan McGee 02 Apr '07

02 Apr '07

Currently "replaces" info is not shown on a -Qi or -Qip operation, but is shown with an -Si. A few questions here: 1. For a -Qip, this information can be retrieved- it is stored in the package and a simple one line addition to the code allows it to be shown. This seems smart. 2. For a -Qi, this information will always be "None" as it is not recorded in the local database. Is there a reason for this? 3. Finally, was there a legitimate reason for this never being done before, or why has it been left out? If someone can't figure out why it should be omitted, I'd like to patch it so that it does show up. -Dan

1 0