- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add ShowOldVersion Option
by Justin Lampley 14 Nov '07

14 Nov '07

First of all, I just wanted to thank all of you for your hard work on pacman, I think it is one of the best package management tools out there. I have been following the list for a bit with the intent of starting to help out with the development of pacman (Or at least to try to help out anyway) so I figured I might as well dive in with a feature that I have had in mind for a while. This patch adds the option of allowing the old package version that is being updated from to be displayed. It takes advantage of the data element in the sync package struct which is populated with the currently installed version of the package. This feature can be beneficial in many ways, but mostly it is a good indicator (at least for me) of whether I should check out the change log of the program. With minor version increases, it is most likely minor updates or bug fixes, but if it is a major version increase, many things might have been changed that are worth checking up on before going through with the install. The following is some output with the ShowOldVersion option enabled as well as the ShowSize option ---- $ sudo src/pacman/pacman.static -Qu Checking for package upgrades... warning: xpdf: forcing upgrade to version 3.02_pl2-1 Remove: lib32-gcc Total Removed Size: 0.00 MB Targets: lib32-gcc-libs-4.2.2-2 [New] [1.05 MB] audacious-player-1.4.0-1 [1.3.2-4] [1.07 MB] audacious-plugins-1.4.0-2 [1.3.5-5.1] [1.68 MB] eclipse-pydev-1.3.10-1 [1.3.9-1] [3.39 MB] fakeroot-1.8.4-1 [1.7.1-3] [0.06 MB] glibc-2.7-6 [2.7-4] [10.78 MB] glproto-1.4.9-1 [1.4.8-1] [0.02 MB] hal-info-0.20071030-1 [0.20071011-1] [0.03 MB] imagemagick-6.3.6.10-1 [6.3.6.6-1] [2.30 MB] lib32-glibc-2.7-5 [2.6.1-2] [3.64 MB] libarchive-2.4.0-1 [2.2.6-2] [0.32 MB] libgphoto2-2.4.0-2 [2.3.1-3] [1.36 MB] libmcs-0.6.0-1 [0.4.1-2] [0.02 MB] libsamplerate-0.1.2-4 [0.1.2-3] [0.20 MB] lincity-ng-1.1.2-1 [1.1.1-1] [29.16 MB] lm_sensors-2.10.5-2 [2.10.5-1] [0.32 MB] tcl-8.4.16-2 [8.4.16-1] [1.63 MB] tk-8.4.16-2 [8.4.16-1] [1.40 MB] ttf-dejavu-2.21-1 [2.20-1] [3.79 MB] xf86-video-ati-6.7.195-3 [6.7.195-1] [3.67 MB] xorg-server-1.4-5 [1.4-4] [7.25 MB] xpdf-3.02_pl2-1 [3.02_pl1-1] [0.49 MB] Total Download Size: 73.64 MB Total Installed Size: 91.08 MB ---- Let me know what you think. Thanks, Justin Lampley

8 12

[pacman-dev] [PATCH] alpm_list_add == alpm_list_add_last I: recursedeps clean-up
by Nagy Gabor 14 Nov '07

14 Nov '07

Hi! Patch attached. See the patch description for details. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 5

[pacman-dev] alpm_list.c "summary"
by Nagy Gabor 14 Nov '07

14 Nov '07

Hi! The main issues are (hopefully) fixed now (at least in Dan's repo) But: I refer to point 1. in this mail again: http://www.archlinux.org/pipermail/pacman-dev/2007-November/009902.html (I'm pretty sure that this doesn't break anything now, just for safety) And some (_subjective_) "elegance" notes: 1. There are some always-true if() stuffs in list_remove: line 312, 320, 323 2. alpm_list_msort and alpm_list_mmerge works fine with no-tail lists (well, it is designed for such lists), so the ~time-costly set tail in line 240 can be stripped out from mmerge. But then we must set tail after alpm_list_msort is finished (since this is a recursive function, we may need an alpm_list_msort wrapper to the (old) _alpm_list_msort) <- this may not worth the effort, I simply don't "like" this. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0

[pacman-dev] [PATCH] Make it easier to ignore multiple packages.
by Nathan Jones 14 Nov '07

14 Nov '07

This makes --ignore and --ignoregroup able to accept multiple packages/groups by separating each with a comma. For instance: pacman -Su --ignore kernel26,udev,glibc This was requested in the comments of FS#8054. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- src/pacman/pacman.c | 18 ++++++++++++++++-- src/pacman/util.c | 24 ++++++++++++++++++++++++ src/pacman/util.h | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index af61ab9..52d5fff 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -314,6 +314,8 @@ static int parseargs(int argc, char *argv[]) }; while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepituwygz", opts, &option_index))) { + alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ + if(opt < 0) { break; } @@ -326,7 +328,13 @@ static int parseargs(int argc, char *argv[]) } config->configfile = strndup(optarg, PATH_MAX); break; - case 1002: alpm_option_add_ignorepkg(strdup(optarg)); break; + case 1002: + list = strsplit(optarg, ','); + for(item = list; item; item = alpm_list_next(item)) { + alpm_option_add_ignorepkg((char *)alpm_list_getdata(item)); + } + FREELIST(list); + break; case 1003: /* debug levels are made more 'human readable' than using a raw logmask * here, error and warning are set in config_new, though perhaps a @@ -370,7 +378,13 @@ static int parseargs(int argc, char *argv[]) } config->have_logfile = 1; break; - case 1010: alpm_option_add_ignoregrp(strdup(optarg)); break; + case 1010: + list = strsplit(optarg, ','); + for(item = list; item; item = alpm_list_next(item)) { + alpm_option_add_ignoregrp((char *)alpm_list_getdata(item)); + } + FREELIST(list); + break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); diff --git a/src/pacman/util.c b/src/pacman/util.c index bc51427..c710f41 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -293,6 +293,30 @@ char *strreplace(const char *str, const char *needle, const char *replace) return newstr; } +/** Splits a string into a list of strings using the chosen character as + * a delimiter. + * + * @param str the string to split + * @param splitchar the character to split at + * + * @return a list containing the duplicated strings + */ +alpm_list_t *strsplit(const char *str, const char splitchar) +{ + alpm_list_t *list = NULL; + const char *prev = str; + + while((str = strchr(str, splitchar))) { + list = alpm_list_add(list, strndup(prev, str - prev)); + str++; + prev = str; + } + + list = alpm_list_add(list, strdup(prev)); + + return(list); +} + void list_display(const char *title, const alpm_list_t *list) { const alpm_list_t *i; diff --git a/src/pacman/util.h b/src/pacman/util.h index 4d17b17..931b456 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -46,6 +46,7 @@ void indentprint(const char *str, int indent); char *strtoupper(char *str); char *strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); +alpm_list_t *strsplit(const char *str, const char splitchar); void list_display(const char *title, const alpm_list_t *list); void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local); int yesno(char *fmt, ...); -- 1.5.3.5

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-575-g46ec9e3
by Dan McGee 14 Nov '07

14 Nov '07

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 46ec9e3548b5b567c7eb18c360f54a77b6313b12 (commit) via 70a91cbb22bb3ec88d518e2e6c43553c53cde318 (commit) via dbc2f902db2486494543f9001a10dfe9a86837f5 (commit) via c29209e7b6555b140794ffb6907fbd33f0d0aa88 (commit) via 103c3ac5a789dc0ec9855c18800a0616940351b1 (commit) via 1b2817f539eb3cd94b48b49736016e0bfedf3e49 (commit) via ec6a7d689b727d384115fcc6e48b38612c91317b (commit) via ca262623fcec32952d4a59ac3003c82c94297ce1 (commit) via 07243f74d1d4277a296c3eb23e876ed48c015e68 (commit) via 5e12d3dec99e7a506683cf625fa4344f57df0b77 (commit) via a0c908dd0da4a00cc98a46407534da67d4aee8a8 (commit) via 53fdae9a1977168767c27a54cf7e4a92394eb6a0 (commit) from 8236be9fd8f97ea8cb4999cf775768bdc276e53e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 46ec9e3548b5b567c7eb18c360f54a77b6313b12 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Tue Nov 13 19:32:56 2007 -0500 Make it easier to ignore multiple packages. This makes --ignore and --ignoregroup able to accept multiple packages/groups by separating each with a comma. For instance: pacman -Su --ignore kernel26,udev,glibc This was requested in the comments of FS#8054. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70a91cbb22bb3ec88d518e2e6c43553c53cde318 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Tue Nov 13 18:38:11 2007 -0500 Add help for --ignoregroup. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> [Dan: split usage line into two lines for clarity] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbc2f902db2486494543f9001a10dfe9a86837f5 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 13 20:56:15 2007 -0600 pacman-optimize: add note saying sync would be helpful Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c29209e7b6555b140794ffb6907fbd33f0d0aa88 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Mon Nov 12 16:54:50 2007 -0500 repo-add: Ensure only adding package's deltas. repo-add was adding the delta files of any package that started with the same package name plus a hyphen. In this example, deltatest-libs delta files were added to the deltatest package: $ repo-add deltatest.db.tar.gz deltatest-1.0.2-1-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'deltatest-1.0.2-1-i686.pkg.tar.gz' -> Removing existing package 'deltatest-1.0.2-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'deltatest-1.0.2rc3-1_to_1.0.2-1-i686.delta' -> Added delta 'deltatest-libs-1.0.0-1_to_1.0.1-1-i686.delta' ==> Creating updated database file /tmp/deltatest.db.tar.gz Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 103c3ac5a789dc0ec9855c18800a0616940351b1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 23:36:20 2007 -0600 configure: Doxygen is disabled by default; manpages are included in dist Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b2817f539eb3cd94b48b49736016e0bfedf3e49 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 22:48:15 2007 -0600 Enforce const correctness on dep functions and rewrite alpm_dep_get_string Add some const specifiers to the dep functions that can have them. In addition, rewrite alpm_dep_get_string to use snprintf and cover all of the bases (operators). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec6a7d689b727d384115fcc6e48b38612c91317b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 19:10:43 2007 -0600 Return libalpm version number to being dot-separated I think I goofed this up when making the big overhaul of configure.ac. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ca262623fcec32952d4a59ac3003c82c94297ce1 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Mon Nov 12 16:54:30 2007 -0500 Add pactest for IgnoreGroup. Also tell pactest to reset IgnoreGroup like it does for IgnorePkg. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07243f74d1d4277a296c3eb23e876ed48c015e68 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 13 00:12:57 2007 -0600 Update valgrind.supp to ignore ld 2.X dl_relocate Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e12d3dec99e7a506683cf625fa4344f57df0b77 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 15:02:33 2007 -0600 Fix display of -Qip output when a package file is given Too many fields were being shown on -Qip output, and sizes were not always correct (-Qi and -Qip output on the same package did not agree). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a0c908dd0da4a00cc98a46407534da67d4aee8a8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 14:14:07 2007 -0600 Remove 'Total Package Size' Having 'Total Installed Size' and 'Total Download Size' makes this size unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53fdae9a1977168767c27a54cf7e4a92394eb6a0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 12:59:45 2007 -0600 Fix memleak with new alpm_list_reverse usage Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 ++-- doc/Makefile.am | 16 +++++---- doc/pacman.8.txt | 8 ++++- lib/libalpm/alpm.h | 12 +++--- lib/libalpm/be_files.c | 4 ++ lib/libalpm/deps.c | 58 +++++++++++++++-------------- lib/libalpm/remove.c | 6 ++- pactest/pmtest.py | 1 + pactest/tests/{sync120.py => sync138.py} | 5 ++- scripts/pacman-optimize.sh.in | 1 + scripts/repo-add.sh.in | 8 ++++- src/pacman/package.c | 3 +- src/pacman/pacman.c | 20 +++++++++- src/pacman/query.c | 7 +++- src/pacman/util.c | 44 +++++++++++++++++++---- src/pacman/util.h | 1 + valgrind.supp | 3 +- 17 files changed, 141 insertions(+), 62 deletions(-) copy pactest/tests/{sync120.py => sync138.py} (73%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Add IgnoreGroup and --ignoregroup option.
by Nathan Jones 13 Nov '07

13 Nov '07

This will be used in the next commit. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- doc/pacman.conf.5.txt | 4 ++++ lib/libalpm/alpm.h | 4 ++++ lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/pacman.c | 15 +++++++++++++++ 5 files changed, 45 insertions(+), 0 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 06ba81d..690e3f4 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -68,6 +68,10 @@ Options Instructs pacman to ignore any upgrades for this package when performing a '\--sysupgrade'. +*IgnoreGroup =* group ...:: + Instructs pacman to ignore any upgrades for all packages in this + group when performing a '\--sysupgrade'. + *Include =* path:: Include another config file. This file can include repositories or general configuration options. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 20d7787..f8558e1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -130,6 +130,10 @@ alpm_list_t *alpm_option_get_holdpkgs(); void alpm_option_add_holdpkg(const char *pkg); void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs); +alpm_list_t *alpm_option_get_ignoregrps(); +void alpm_option_add_ignoregrp(const char *grp); +void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); + time_t alpm_option_get_upgradedelay(); void alpm_option_set_upgradedelay(time_t delay); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index af54949..78ac117 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -100,6 +100,7 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noextract); FREELIST(handle->ignorepkg); FREELIST(handle->holdpkg); + FREELIST(handle->ignoregrp); FREE(handle); } @@ -211,6 +212,15 @@ alpm_list_t SYMEXPORT *alpm_option_get_holdpkgs() return handle->holdpkg; } +alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->ignoregrp; +} + time_t SYMEXPORT alpm_option_get_upgradedelay() { if (handle == NULL) { @@ -461,6 +471,17 @@ void SYMEXPORT alpm_option_set_holdpkgs(alpm_list_t *holdpkgs) if(holdpkgs) handle->holdpkg = holdpkgs; } +void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) +{ + handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); +} + +void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) +{ + if(handle->ignoregrp) FREELIST(handle->ignoregrp); + if(ignoregrps) handle->ignoregrp = ignoregrps; +} + void SYMEXPORT alpm_option_set_upgradedelay(time_t delay) { handle->upgradedelay = delay; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 0874ecd..63a4688 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -55,6 +55,7 @@ typedef struct _pmhandle_t { alpm_list_t *noextract; /* List of packages NOT to extract */ /*TODO is this used?*/ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ + alpm_list_t *ignoregrp; /* List of groups to ignore */ /* options */ unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 9c650f2..2f916e2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -309,6 +309,7 @@ static int parseargs(int argc, char *argv[]) {"cachedir", required_argument, 0, 1007}, {"asdeps", no_argument, 0, 1008}, {"logfile", required_argument, 0, 1009}, + {"ignoregroup", required_argument, 0, 1010}, {0, 0, 0, 0} }; @@ -369,6 +370,7 @@ static int parseargs(int argc, char *argv[]) } config->have_logfile = 1; break; + case 1010: alpm_option_add_ignoregrp(strdup(optarg)); break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); @@ -627,6 +629,19 @@ static int _parseconfig(const char *file, const char *givensection, } alpm_option_add_ignorepkg(p); pm_printf(PM_LOG_DEBUG, "config: ignorepkg: %s\n", p); + } else if(strcmp(key, "IgnoreGroup") == 0 || strcmp(upperkey, "IGNOREGROUP") == 0) { + char *p = ptr; + char *q; + + while((q = strchr(p, ' '))) { + *q = '\0'; + alpm_option_add_ignoregrp(p); + pm_printf(PM_LOG_DEBUG, "config: ignoregroup: %s", p); + p = q; + p++; + } + alpm_option_add_ignoregrp(p); + pm_printf(PM_LOG_DEBUG, "config: ignoregroup: %s\n", p); } else if(strcmp(key, "HoldPkg") == 0 || strcmp(upperkey, "HOLDPKG") == 0) { char *p = ptr; char *q; -- 1.5.3.5

4 7

[pacman-dev] -Si is laconic
by Nagy Gabor 13 Nov '07

13 Nov '07

Hi! When I made the previously posted speed tests, I noticed that -Si hides lots of info. Is there any special reason for this (we are not proud of our packagers for example;-) or we just forgot to update dump_pkg_sync in pacman/package.c? I think that dump_pkg_sync should be merged to dump_pkg_full (with a new is_local input parameter for example) to keep -Qi and -Si in sync. And this is a good time (just before the 3.1 release) to review -Qi too. I would do this, but I'm not sure that you would like an "ngaba-English" special edition of pacman :-) Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 5

[pacman-dev] Backend DB [was: Hypotetic pacman's db structure]
by Aaron Griffin 13 Nov '07

13 Nov '07

On Nov 9, 2007 3:22 PM, Miklos Vajna <vmiklos(a)frugalware.org> wrote: > On Fri, Nov 09, 2007 at 05:26:01PM +0100, JJDaNiMoTh <jjdanimoth(a)gmail.com> wrote: > > I'm writing an example databe structure for pacman db ( may be useful > > when someone decide to use SQLite as backend, and not simple text > > file). [1] > > last year i writed such a structure, but it was much more complex: > > http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=blob;f=sql/pacma… > > and to be honest i must say i agree with Aaron about using an sql-based > db for such a lowlevel purpose (pkgdb) would be something like using > curl in libpacman Hah, this is the second time you agreed with me! The sky is falling! To probe your thoughts a bit further, if the world were ideal, what kind of backend would YOU go for?

6 12

[pacman-dev] Misleading pacman man page
by Aaron Griffin 13 Nov '07

13 Nov '07

This is a man page issue that's actually got me a few times, and seems to confuse users as well. This is the pacman man page. On Nov 12, 2007 5:34 PM, Goulven Guillard <lecotegougdelaforce(a)free.fr> wrote: > Aaron Griffin a écrit : > > On Nov 12, 2007 5:21 PM, Goulven Guillard <lecotegougdelaforce(a)free.fr> wrote: > >> Aaron Griffin a écrit : > >>> For both of the bugs you posted, pacman -Rd is the solution > >> Oh, ok. Sorry, the comment was so tiny that I didn't see it. :-) > >> > >> And thanks for the tip, it seems like I misread pacman's manpage. > > > > It's in the OPTIONS section above all the other ones - it's a little > > misleading, but that section contains the common options for all > > commands. > > Yes, I agree it's misleading. But anyway I have no excuse, I have read > all the manpage... I must be tired. Basically, he didn't know about -Rd because it is not documented in the "REMOVE OPTIONS" section, but above it, and that is not really referenced anywhere. I know I've done a double take once or twice. Options: * Point out the OPTIONS section better - perhaps adding a little "See Also" at the top of each specific options section? * Remove the OPTIONS section and duplicate it in each sub section * Do nothing What do you all think?

2 1

[pacman-dev] [PATCH] repo-add: Ensure only adding package's deltas.
by Nathan Jones 12 Nov '07

12 Nov '07

repo-add was adding the delta files of any package that started with the same package name plus a hyphen. In this example, deltatest-libs delta files were added to the deltatest package: $ repo-add deltatest.db.tar.gz deltatest-1.0.2-1-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'deltatest-1.0.2-1-i686.pkg.tar.gz' -> Removing existing package 'deltatest-1.0.2-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'deltatest-1.0.2rc3-1_to_1.0.2-1-i686.delta' -> Added delta 'deltatest-libs-1.0.0-1_to_1.0.1-1-i686.delta' ==> Creating updated database file /tmp/deltatest.db.tar.gz Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- scripts/repo-add.sh.in | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4dfedbe..adcefc1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -218,7 +218,13 @@ db_write_entry() # create deltas entry if there are delta files for delta in $startdir/$pkgname-*-*_to_*-*-$arch.delta; do - if [ -f "$delta" ]; then + # This for loop also pulls in all files that start with the current package + # name and are followed by a -whatever. For instance, running this loop for + # gcc would also grab gcc-libs. To guard against this, compare the package + # name of the delta to the current package name. + local filename=$(basename "$delta") + local dpkgname="$(echo "$filename" | sed -e 's/$.*$-.*-.*_to_.*-.*-.*.delta/\1/')" + if [ "$pkgname" = "$dpkgname" -a -f "$delta" ]; then # create deltas file if it does not already exist if [ ! -f "deltas" ]; then msg2 "$(gettext "Creating 'deltas' db entry...")" -- 1.5.3.5

1 0