November 2007 - Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Add pactest for IgnoreGroup.
by Nathan Jones 12 Nov '07

12 Nov '07

Also tell pactest to reset IgnoreGroup like it does for IgnorePkg. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- pactest/pmtest.py | 1 + pactest/tests/sync138.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync138.py diff --git a/pactest/pmtest.py b/pactest/pmtest.py index 00dd3cb..e0b3fd4 100755 --- a/pactest/pmtest.py +++ b/pactest/pmtest.py @@ -84,6 +84,7 @@ class pmtest: self.option = { "noupgrade": [], "ignorepkg": [], + "ignoregroup": [], "noextract": [] } diff --git a/pactest/tests/sync138.py b/pactest/tests/sync138.py new file mode 100644 index 0000000..410c7f0 --- /dev/null +++ b/pactest/tests/sync138.py @@ -0,0 +1,22 @@ +self.description = "Sysupgrade of packages in 'IgnoreGroup'" + +sp1 = pmpkg("pkg1", "1.0-2") +sp2 = pmpkg("pkg2", "1.0-2") +sp2.groups = ["grp"] + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") +lp2 = pmpkg("pkg2") + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.option["ignoregroup"] = ["grp"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("!PKG_MODIFIED=pkg2") -- 1.5.3.5

1 0

[pacman-dev] [PATCH] makepkg: remove .pacsave files when uninstalling dependencies
by Roman Kyrylych 12 Nov '07

12 Nov '07

Hi! This is a small patch that fixes this: ==> Compressing package... ==> Removing installed dependencies... ERROR: ld.so: object 'libfakeroot.so' from LD_PRELOAD cannot be preloaded: ignored. checking dependencies... done. Targets: at Do you want to remove these packages? [Y/n] warning: /etc/at.deny saved as /etc/at.deny.pacsave (1/1) removing at [#####################] 100% ==> Finished making: gnome-schedule (Sun Nov 11 16:22:29 EET 2007) -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] add043.py: alpm_depcmp and provisions
by Nagy Gabor 12 Nov '07

12 Nov '07

Hi! Give a look at the following pactest: ----add043.py---- self.description = "provision>=1.0-2 needed" p1 = pmpkg("pkg1", "1.0-2") p1.depends = ["provision>=1.0-2"] self.addpkg(p1) p2 = pmpkg("pkg2", "1.0-2") p2.provides = ["provision"] self.addpkg2db("local", p2) self.args = "-A %s" % p1.filename() self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") ----------------- This currently fails. IMHO this is a bug: alpm_depcmp uses the package version in the "provision case" too (so if you change p1.depends to "provision<=1.0-1", then the pactest will pass.) This is a good time to ask you about versioned provisions again (before fix): Personally, I like the idea; and the implementation needs ~0 effort and would cause ~0 slowdown; and would be 100% compatible with "no-version" provisions. I don't know if package maintainers need this feature or not (someone could ask them on arch-* ML <- I'm not a subscriber there), but this is just an extra feature, they needn't use it. Bye, ngaba

3 2

[pacman-dev] lstat issue / fileconflict001 pactest
by Xavier 12 Nov '07

12 Nov '07

Following the discussion started in the comments of bug 7484, because I think it's more appropriate : http://bugs.archlinux.org/task/7484#comment20837 I recently discovered that a trailing / is very important when using lstat, for directory symlinks. In the following situation : symdir -> realdir/ lstat(symdir) stats the link itself, but lstat(symdir/) stats realdir. So lstat(symdir/) seems equivalent to stat(symdir). The archive extraction code in add.c that Dan rewrote didn't take this into consideration, so he added a new _alpm_lstat that removes the trailing / when there is one : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=b55abdce7aebb142… A little typo in _alpm_lstat (path instead of newpath) made this change not active yet. As Dan noticed, fixing this makes fileconflict001 pass. The only purpose of this mail is explaining why. So in this pactest, we have the following situation : dir/realdir/ dir/symdir -> realdir Then pkg1 installs dir/realdir/file , and pkg2 installs dir/symdir/file . Since in this case, symdir points to realdir, pkg1 and pkg2 have a fileconflict on "file". But if fileconflict001 pass after the bugfix mentioned above, it's not because pacman detects there is a package<->package conflict between dir/realdir/file and dir/symdir/file. Instead, it detects a filesystem <-> package conflict between dir/symdir/ from pkg2 (which is a real directory there), and the dir/symdir symlink on the filesystem. So that's plain wrong. The fileconflict code currently does a lstat(dir/symdir/), which doesn't stat the symdir symlink, but the real directory realdir. So it treated dir/symdir/ as a directory, and ignored it : 336 /* stat the file - if it exists, do some checks / 337 if(_alpm_lstat(path, &buf) != 0) { 338 continue; 339 } 340 if(S_ISDIR(buf.st_mode)) { 341 _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path); Now, with the new behavior of _alpm_lstat, the code does a lstat(dir/symdir), which stats the symlink. And the following code will treat this as a conflict. The case of fileconflict001 is probably another situation easier to detect during the transaction (coupled with a rollback system), rather than beforehand. Otherwise, maybe the file conflict code should keep using the normal lstat, instead of _alpm_lstat which removes the trailing /.

4 9

[pacman-dev] Generate doxygen man pages on "make dist"
by Aaron Griffin 12 Nov '07

12 Nov '07

Would anyone have a problem with generating doxygen man pages on the "make dist" target? The reason I ask, is that having a doxygen makedepend is breaking our little core/extra repo separation, and this is the cleanest fix. It also cleans up building pacman. If you ask me, I don't see a problem with pre-generating them Opinions?

2 2