- Pacman-dev - lists.archlinux.org

[pacman-dev] Which BSD?
by Allan McRae 08 Nov '10

08 Nov '10

Hi, Can the people who run pacman on some flavor of BSD let me know what type you use? I would like to install a relevant version in a VM to test out some changes to pacman. Allan

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 05 Nov '10

05 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Additional cleanup at Dan's request, and added documentation to man page wrt to this feature. Woo, documentation. doc/pacman.8.txt | 5 +++++ src/pacman/pacman.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4bdb3f9..418ddfc 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -25,6 +25,11 @@ Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the ``Arch Linux Package Management'' library. This library allows alternative front ends to be written (for instance, a GUI front end). +Invoking pacman involves specifying an operation with any potential options +and targets to operate on. A 'target' is usually a package name, filename, URL, +or a search string. Targets can be provided as arguments to pacman and/or +passed through standard input. + Operations ---------- diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..39390a5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,39 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* we also support reading targets from stdin */ + if(!isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [RFC] New member selection when installing group
by Xavier Chantry 05 Nov '10

05 Nov '10

One part of what's on http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=working is about proposing a new interactive selection for installing groups. I did not like the old one, because I don't want to answer 50 questions when I install one group with 50 members. This is ugly, and the selection is not easily reproducible, for example you cannot easily copy/paste the answers of one run to another. I think a text frontend really sucks for this kind of workflow, a graphical or at least ncurses frontend would do much better. But my new provision selection inspired to both Jakob and Dan that we could have the same for groups, so I went ahead and implemented it over the weekend. $ pacman -S base-devel :: There are 11 members in group base-devel: :: Repository testing 1) make :: Repository core 2) autoconf 3) automake 4) bison 5) fakeroot 6) flex 7) gcc 8) libtool 9) m4 10) patch 11) pkg-config Which ones do you want to install? Enter a number (default=all): Multiple choices are possible, separated by spaces. Either single number or a range a-b. Both single numbers and range can be negated with ^ prefix. Choices are applied successively, so each choice override previous ones (in case of conflict). If first choice is negative, all targets are implicitly selected, otherwise no target is implicitly selected. Examples : 1) 3 6 8 : install automake, flex and libtool 2) 2-11 : install all targets in core repo 3) ^1 or 1-11 ^1 : install everything but make (like 2)) 4) ^2-11 : install everything but targets 2-11, i.e. only testing/make is left No idea how practical / user-friendly it is, so feedback and testing welcome.

4 7

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 05 Nov '10

05 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Resending as per Allan's request with modifications from the origin 7/24 submission. Changes: * Check return value of freopen * Assign '\0' instead of 0 to null terminate * Use post-increment instead of pre-increment * Check for buffer overflow condition (not convinced my method is reasonable) * Dynamically find stdin's FD instead of assuming it's 1 * Use PATH_MAX instead of BUFSIZ Concerns: * The verbiage I've used in the new strings is probably not ideal. src/pacman/pacman.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..e078aab 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,38 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + line[i] = '\0'; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 04 Nov '10

04 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Revised from the original 7/24 submission at Allan's request to check the return value of freopen(). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- src/pacman/pacman.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..6f40a97 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,32 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(0)) { + char line[BUFSIZ]; + int i = 0; + while((line[i] = fgetc(stdin)) != EOF) { + if(isspace(line[i])) { + line[i] = 0; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + ++i; + } + } + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

3 6

[pacman-dev] [PATCH] Sync data after writing to the local db
by Allan McRae 31 Oct '10

31 Oct '10

This should hopefully reduce local db corruption issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 4574bd4..cb12abb 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -841,6 +841,7 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "\n"); } + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } @@ -869,6 +870,8 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } -- 1.7.3.2

4 4

[pacman-dev] [PATCH] Add function to list mount points
by Allan McRae 31 Oct '10

31 Oct '10

The helper function _alpm_mount_list provides a relatively portable interface to obtaining a list of mount pints on a system. This will be useful in checking for disk space availability when installing packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I have not tested the HAVE_GETMNTINFO path as that requires BSD4.4, OSX or NetBSD 3.0. However, it is taken from various example code on the internet so should work... configure.ac | 6 +++--- lib/libalpm/util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..5bbd761 100644 --- a/configure.ac +++ b/configure.ac @@ -185,9 +185,9 @@ AC_FUNC_FORK AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MKTIME AC_TYPE_SIGNAL -AC_CHECK_FUNCS([geteuid realpath regcomp strcasecmp \ - strndup strrchr strsep swprintf \ - wcwidth uname]) +AC_CHECK_FUNCS([geteuid getmntent getmntinfo realpath \ + regcomp strcasecmp strndup strrchr \ + strsep swprintf wcwidth uname]) # Enable large file support if available AC_SYS_LARGEFILE diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2661241..9b7454f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -39,6 +39,15 @@ #include <sys/stat.h> #include <sys/wait.h> +#ifdef HAVE_GETMNTENT +#include <mntent.h> +#endif + +#ifdef HAVE_GETMNTINFO +#include <sys/mount.h> +#include <sys/statvfs.h> +#endif + /* libarchive */ #include <archive.h> #include <archive_entry.h> @@ -845,4 +854,44 @@ int _alpm_splitname(const char *target, pmpkg_t *pkg) return(0); } +alpm_list_t *_alpm_mount_list() +{ + alpm_list_t *mount_points = NULL; + +#ifdef HAVE_GETMNTENT + struct mntent *mnt; + FILE *fp; + + fp = setmntent(MOUNTED, "r"); + + if (fp == NULL) { + return NULL; + } + + while((mnt = getmntent (fp))) { + mount_points = alpm_list_add(mount_points, strdup(mnt->mnt_dir)); + } + + endmntent(fp); +#endif + +#ifdef HAVE_GETMNTINFO + struct statvfs *fsp; + int entries; + + entries = getmntinfo (&fsp, MNT_NOWAIT); + + if (entries < 0) { + return NULL; + } + + for (; entries-- > 0; fsp++) { + mount_points = alpm_list_add(mount_points, strdup(fsp->f_mntonname)); + } +#endif + + mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), _alpm_str_cmp); + return(mount_points); +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 75e2c45..0d2ac79 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -78,6 +78,7 @@ int _alpm_lstat(const char *path, struct stat *buf); int _alpm_test_md5sum(const char *filepath, const char *md5sum); char *_alpm_archive_fgets(char *line, size_t size, struct archive *a); int _alpm_splitname(const char *target, pmpkg_t *pkg); +alpm_list_t *_alpm_mount_list(); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 1.7.3.2

2 3

Re: [pacman-dev] Chat with toofishes@jabber.org
by Xavier Chantry 30 Oct '10

30 Oct '10

On Fri, Oct 8, 2010 at 7:06 PM, toofishes(a)jabber.org <toofishes(a)jabber.org>wrote: > 5:48 PM me: waoh, where does this come from ? :) > what made you implement epoch ? > toofishes: the stupid bug reports > clicked on one and went "ok we have three of these lets fix this shit" > 5:49 PM it ended up not even being that much change, which was nice > had to fix a few things after running tests and such, but overall pretty > straightforward > me: what was hard ? keep support for force ? > 5:50 PM toofishes: yeah > ensuring both forward/backward support > 5:51 PM me: the result looks pretty good and natural > toofishes: yeah > and eventually some of it can be cleaned up > can you spot the one drawback from this though? i didn't catch it at > first, had to go back and fix my patch > you will laugh because you were talking about it the other day. > 5:52 PM me: give me a hint, is it pacman related or makepkg/repo-add > toofishes: pacman > database releated > 5:56 PM me: damn I cannot see, looking at the patch in be_files.c . and > last thing I remember discussing about database was sanity check. > maybe bogus epoch values or something > force was just on/off > toofishes: no > we didn't have to read every desc file before > but now we do to always get the epoch value back > 5:58 PM me: damn I actually spotted the vercmp call and force/epoch was in > a different order > but I just thought force definitely looked weird > 5:59 PM ok I mentioned slow db too, I never considered this depends/desc > thing really. nagy mentioned it many times though > and I thought we were already fucked > toofishes: yeah > we just need to redo the db, tahts all :) > Nagy and I discussed a bit that topic. Don't we already read all local depends file for conflict and/or dep checking ? So this means we'll now read all local depends + all desc files ? Why not put epoch stuff in the local depends file then ? IIRC there has been a plan for years to move replaces and force from depends to desc, probably for sync db? and for similar reasons, but no one ever dared to do it. Another crazy thought, since epoch is really just a version extension, why not define it as a version prefix or something ? 3.5.0 < 2#3.4 < 3#2.0 or whatever crazy syntax we can come up with. Then we just need to have vercmp support that, and that's all, nothing complex to do in any database. I am sorry this comes up a bit late, but only git code has been touched and no harm has been made as far as I know, I just want to be sure that we carefully considered all possible solutions for the stupid versioning some projects use, and that we indeed chose the best way (epoch is probably alright and better than force), but also the best implementation.

3 4

[pacman-dev] [PATCH 2/3] Merge desc and depends files in local db
by Allan McRae 30 Oct '10

30 Oct '10

Whenever depends is needed from the local db, so is desc. The only disadvantage to merging them is the additional time taken to read the depends entries when they are not needed. As depends is in general relatively small, the additional time taken to read it in will be negligable. Also, merging these files will speed up local database access due to less file seeks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 144 ++++++++++++++++++---------------------------- lib/libalpm/be_package.c | 2 +- lib/libalpm/db.h | 9 +-- 3 files changed, 61 insertions(+), 94 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2212752..4574bd4 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -165,25 +165,25 @@ int _cache_get_epoch(pmpkg_t *pkg) alpm_list_t *_cache_get_depends(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->depends; } alpm_list_t *_cache_get_optdepends(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->optdepends; } alpm_list_t *_cache_get_conflicts(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->conflicts; } alpm_list_t *_cache_get_provides(pmpkg_t *pkg) { - LAZY_LOAD(INFRQ_DEPENDS, NULL); + LAZY_LOAD(INFRQ_DESC, NULL); return pkg->provides; } @@ -614,32 +614,28 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(!info->epoch) { info->epoch = 1; } - } - } - fclose(fp); - fp = NULL; - } - - /* FILES */ - if(inforeq & INFRQ_FILES) { - snprintf(path, PATH_MAX, "%sfiles", pkgpath); - if((fp = fopen(path, "r")) == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); - goto error; - } - while(fgets(line, sizeof(line), fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { + } else if(strcmp(line, "%DEPENDS%") == 0) { + while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { + pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); + info->depends = alpm_list_add(info->depends, dep); + } + } else if(strcmp(line, "%OPTDEPENDS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); + info->optdepends = alpm_list_add(info->optdepends, linedup); } - } else if(strcmp(line, "%BACKUP%") == 0) { + } else if(strcmp(line, "%CONFLICTS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); + info->conflicts = alpm_list_add(info->conflicts, linedup); + } + } else if(strcmp(line, "%PROVIDES%") == 0) { + while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { + char *linedup; + STRDUP(linedup, _alpm_strtrim(line), goto error); + info->provides = alpm_list_add(info->provides, linedup); } } } @@ -647,40 +643,26 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fp = NULL; } - /* DEPENDS */ - if(inforeq & INFRQ_DEPENDS) { - snprintf(path, PATH_MAX, "%sdepends", pkgpath); + /* FILES */ + if(inforeq & INFRQ_FILES) { + snprintf(path, PATH_MAX, "%sfiles", pkgpath); if((fp = fopen(path, "r")) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - if(fgets(line, sizeof(line), fp) == NULL) { - break; - } + while(fgets(line, sizeof(line), fp)) { _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } - } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } - } else if(strcmp(line, "%CONFLICTS%") == 0) { + if(strcmp(line, "%FILES%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); + info->files = alpm_list_add(info->files, linedup); } - } else if(strcmp(line, "%PROVIDES%") == 0) { + } else if(strcmp(line, "%BACKUP%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); + info->backup = alpm_list_add(info->backup, linedup); } } } @@ -828,49 +810,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "%%REASON%%\n" "%u\n\n", info->reason); } - - fclose(fp); - fp = NULL; - } - - /* FILES */ - if(inforeq & INFRQ_FILES) { - _alpm_log(PM_LOG_DEBUG, "writing %s-%s FILES information back to db\n", - info->name, info->version); - snprintf(path, PATH_MAX, "%sfiles", pkgpath); - if((fp = fopen(path, "w")) == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); - retval = -1; - goto cleanup; - } - if(info->files) { - fprintf(fp, "%%FILES%%\n"); - for(lp = info->files; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - } - if(info->backup) { - fprintf(fp, "%%BACKUP%%\n"); - for(lp = info->backup; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - } - fclose(fp); - fp = NULL; - } - - /* DEPENDS */ - if(inforeq & INFRQ_DEPENDS) { - _alpm_log(PM_LOG_DEBUG, "writing %s-%s DEPENDS information back to db\n", - info->name, info->version); - snprintf(path, PATH_MAX, "%sdepends", pkgpath); - if((fp = fopen(path, "w")) == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); - retval = -1; - goto cleanup; - } if(info->depends) { fputs("%DEPENDS%\n", fp); for(lp = info->depends; lp; lp = lp->next) { @@ -901,6 +840,35 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + + fclose(fp); + fp = NULL; + } + + /* FILES */ + if(inforeq & INFRQ_FILES) { + _alpm_log(PM_LOG_DEBUG, "writing %s-%s FILES information back to db\n", + info->name, info->version); + snprintf(path, PATH_MAX, "%sfiles", pkgpath); + if((fp = fopen(path, "w")) == NULL) { + _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); + retval = -1; + goto cleanup; + } + if(info->files) { + fprintf(fp, "%%FILES%%\n"); + for(lp = info->files; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); + } + if(info->backup) { + fprintf(fp, "%%BACKUP%%\n"); + for(lp = info->backup; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); + } fclose(fp); fp = NULL; } diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 254f830..d63ab1f 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -363,7 +363,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) } else { /* get rid of any partial filelist we may have collected, it is invalid */ FREELIST(newpkg->files); - newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_DEPENDS; + newpkg->infolevel = INFRQ_BASE | INFRQ_DESC; } return(newpkg); diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5352e9e..133b095 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -34,12 +34,11 @@ typedef enum _pmdbinfrq_t { INFRQ_BASE = 1, INFRQ_DESC = (1 << 1), - INFRQ_DEPENDS = (1 << 2), - INFRQ_FILES = (1 << 3), - INFRQ_SCRIPTLET = (1 << 4), - INFRQ_DSIZE = (1 << 5), + INFRQ_FILES = (1 << 2), + INFRQ_SCRIPTLET = (1 << 3), + INFRQ_DSIZE = (1 << 4), /* ALL should be info stored in the package or database */ - INFRQ_ALL = 0x3F + INFRQ_ALL = 0x1F } pmdbinfrq_t; struct db_operations { -- 1.7.3.2

1 2

[pacman-dev] [PATCH 3/3] Update pactest suite for change in db structure
by Allan McRae 30 Oct '10

30 Oct '10

Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/pmdb.py | 62 ++++++++++++++----------------------------------- test/pacman/pmpkg.py | 4 --- 2 files changed, 18 insertions(+), 48 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index af5525c..7f79819 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -163,6 +163,14 @@ def db_read(self, name): elif line == "%FORCE%": fd.readline() pkg.force = 1 + elif line == "%DEPENDS%": + pkg.depends = _getsection(fd) + elif line == "%OPTDEPENDS%": + pkg.optdepends = _getsection(fd) + elif line == "%CONFLICTS%": + pkg.conflicts = _getsection(fd) + elif line == "%PROVIDES%": + pkg.provides = _getsection(fd) fd.close() pkg.checksum["desc"] = getmd5sum(filename) pkg.mtime["desc"] = getmtime(filename) @@ -189,29 +197,6 @@ def db_read(self, name): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - filename = os.path.join(path, "depends") - if not os.path.isfile(filename): - print "invalid db entry found (depends missing) for pkg", pkgname - return None - fd = file(filename, "r") - while 1: - line = fd.readline() - if not line: - break - line = line.strip("\n") - if line == "%DEPENDS%": - pkg.depends = _getsection(fd) - elif line == "%OPTDEPENDS%": - pkg.optdepends = _getsection(fd) - elif line == "%CONFLICTS%": - pkg.conflicts = _getsection(fd) - elif line == "%PROVIDES%": - pkg.provides = _getsection(fd) - fd.close() - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install filename = os.path.join(path, "install") if os.path.isfile(filename): @@ -233,9 +218,9 @@ def db_write(self, pkg): # desc # for local db entries: name, version, desc, groups, url, license, # arch, builddate, installdate, packager, - # size, reason + # size, reason, depends, conflicts, provides # for sync entries: name, version, desc, groups, csize, md5sum, - # replaces, force + # replaces, force, depends, conflicts, provides data = [_mksection("NAME", pkg.name)] data.append(_mksection("VERSION", pkg.version)) if pkg.desc: @@ -250,6 +235,14 @@ def db_write(self, pkg): data.append(_mksection("BUILDDATE", pkg.builddate)) if pkg.packager: data.append(_mksection("PACKAGER", pkg.packager)) + if pkg.depends: + data.append(_mksection("DEPENDS", pkg.depends)) + if pkg.optdepends: + data.append(_mksection("OPTDEPENDS", pkg.optdepends)) + if pkg.conflicts: + data.append(_mksection("CONFLICTS", pkg.conflicts)) + if pkg.provides: + data.append(_mksection("PROVIDES", pkg.provides)) if self.treename == "local": if pkg.url: data.append(_mksection("URL", pkg.url)) @@ -297,25 +290,6 @@ def db_write(self, pkg): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - # for local db entries: depends, conflicts, provides - # for sync ones: depends, conflicts, provides - data = [] - if pkg.depends: - data.append(_mksection("DEPENDS", pkg.depends)) - if pkg.optdepends: - data.append(_mksection("OPTDEPENDS", pkg.optdepends)) - if pkg.conflicts: - data.append(_mksection("CONFLICTS", pkg.conflicts)) - if pkg.provides: - data.append(_mksection("PROVIDES", pkg.provides)) - if data: - data.append("") - filename = os.path.join(path, "depends") - mkfile(filename, "\n".join(data)) - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install if self.treename == "local": empty = 1 diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index aaee28b..9ce0978 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -51,7 +51,6 @@ def __init__(self, name, version = "1.0-1"): self.replaces = [] self.force = 0 self.epoch = 0 - # depends self.depends = [] self.optdepends = [] self.conflicts = [] @@ -70,13 +69,11 @@ def __init__(self, name, version = "1.0-1"): } self.checksum = { "desc": "", - "depends": "", "files": "", "install": "" } self.mtime = { "desc": (0, 0, 0), - "depends": (0, 0, 0), "files": (0, 0, 0), "install": (0, 0, 0) } @@ -85,7 +82,6 @@ def __str__(self): s = ["%s" % self.fullname()] s.append("description: %s" % self.desc) s.append("url: %s" % self.url) - s.append("depends: %s" % " ".join(self.depends)) s.append("files: %s" % " ".join(self.files)) s.append("reason: %d" % self.reason) return "\n".join(s) -- 1.7.3.2

1 0