- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 8/8] Replace hardcoded option numbers with enumeration
by Laszlo Papp 25 Sep '09

25 Sep '09

Pacman's long option parsing used hardcoded numbers to identify them. This is not good practice, so replace them with enumeration constants. ./src/pacman/conf.h: - This contains the enumeration of long options that are used in pacman.c source file. ./src/pacman/pacman.c - This source contains long options where the changing was happened. It's safer and more comfortable now, instead of hard coding 10-15 or more integer value into the code. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/conf.h | 18 ++++++++++++++++ src/pacman/pacman.c | 56 +++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 3c588a7..c854df4 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -88,6 +88,24 @@ enum { PM_OP_DEPTEST }; +/* Long Operations */ +enum { + PM_LONG_OP_NOCONFIRM = 1000, + PM_LONG_OP_CONFIG, + PM_LONG_OP_IGNORE, + PM_LONG_OP_DEBUG, + PM_LONG_OP_NOPROGRESSBAR, + PM_LONG_OP_NOSCRIPTLET, + PM_LONG_OP_ASK, + PM_LONG_OP_CACHEDIR, + PM_LONG_OP_ASDEPS, + PM_LONG_OP_LOGFILE, + PM_LONG_OP_IGNOREGROUP, + PM_LONG_OP_NEEDED, + PM_LONG_OP_ASEXPLICIT, + PM_LONG_OP_ARCH +}; + /* clean method */ enum { PM_CLEAN_KEEPINST = 0, /* default */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ac51502..30b39b5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -378,20 +378,20 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"noconfirm", no_argument, 0, 1000}, - {"config", required_argument, 0, 1001}, - {"ignore", required_argument, 0, 1002}, - {"debug", optional_argument, 0, 1003}, - {"noprogressbar", no_argument, 0, 1004}, - {"noscriptlet", no_argument, 0, 1005}, - {"ask", required_argument, 0, 1006}, - {"cachedir", required_argument, 0, 1007}, - {"asdeps", no_argument, 0, 1008}, - {"logfile", required_argument, 0, 1009}, - {"ignoregroup", required_argument, 0, 1010}, - {"needed", no_argument, 0, 1011}, - {"asexplicit", no_argument, 0, 1012}, - {"arch", required_argument, 0, 1013}, + {"noconfirm", no_argument, 0, PM_LONG_OP_NOCONFIRM}, + {"config", required_argument, 0, PM_LONG_OP_CONFIG}, + {"ignore", required_argument, 0, PM_LONG_OP_IGNORE}, + {"debug", optional_argument, 0, PM_LONG_OP_DEBUG}, + {"noprogressbar", no_argument, 0, PM_LONG_OP_NOPROGRESSBAR}, + {"noscriptlet", no_argument, 0, PM_LONG_OP_NOSCRIPTLET}, + {"ask", required_argument, 0, PM_LONG_OP_ASK}, + {"cachedir", required_argument, 0, PM_LONG_OP_CACHEDIR}, + {"asdeps", no_argument, 0, PM_LONG_OP_ASDEPS}, + {"logfile", required_argument, 0, PM_LONG_OP_LOGFILE}, + {"ignoregroup", required_argument, 0, PM_LONG_OP_IGNOREGROUP}, + {"needed", no_argument, 0, PM_LONG_OP_NEEDED}, + {"asexplicit", no_argument, 0, PM_LONG_OP_ASEXPLICIT}, + {"arch", required_argument, 0, PM_LONG_OP_ARCH}, {0, 0, 0, 0} }; @@ -403,21 +403,21 @@ static int parseargs(int argc, char *argv[]) } switch(opt) { case 0: break; - case 1000: config->noconfirm = 1; break; - case 1001: + case PM_LONG_OP_NOCONFIRM: config->noconfirm = 1; break; + case PM_LONG_OP_CONFIG: if(config->configfile) { free(config->configfile); } config->configfile = strndup(optarg, PATH_MAX); break; - case 1002: + case PM_LONG_OP_IGNORE: 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: + case PM_LONG_OP_DEBUG: /* debug levels are made more 'human readable' than using a raw logmask * here, error and warning are set in config_new, though perhaps a * --quiet option will remove these later */ @@ -440,34 +440,34 @@ static int parseargs(int argc, char *argv[]) /* progress bars get wonky with debug on, shut them off */ config->noprogressbar = 1; break; - case 1004: config->noprogressbar = 1; break; - case 1005: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; - case 1006: config->noask = 1; config->ask = atoi(optarg); break; - case 1007: + case PM_LONG_OP_NOPROGRESSBAR: config->noprogressbar = 1; break; + case PM_LONG_OP_NOSCRIPTLET: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; + case PM_LONG_OP_ASK: config->noask = 1; config->ask = atoi(optarg); break; + case PM_LONG_OP_CACHEDIR: if(alpm_option_add_cachedir(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"), optarg, alpm_strerrorlast()); return(1); } break; - case 1008: + case PM_LONG_OP_ASDEPS: config->flags |= PM_TRANS_FLAG_ALLDEPS; break; - case 1009: + case PM_LONG_OP_LOGFILE: config->logfile = strndup(optarg, PATH_MAX); break; - case 1010: + case PM_LONG_OP_IGNOREGROUP: 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 1011: config->flags |= PM_TRANS_FLAG_NEEDED; break; - case 1012: + case PM_LONG_OP_NEEDED: config->flags |= PM_TRANS_FLAG_NEEDED; break; + case PM_LONG_OP_ASEXPLICIT: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; - case 1013: + case PM_LONG_OP_ARCH: setarch(optarg); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; -- 1.6.4.4

1 0

[pacman-dev] download / database problems
by Xavier 25 Sep '09

25 Sep '09

Today I got very strange results downloading packages with pacman. For example : gnome-common-2.28.0... 8,9K 112,2K/s 00:00:00 [#####################] 21167% > ls -lh /var/cache/pacman/pkg/gnome-common-2.28.0-1-any.pkg.tar.gz -rw-r--r-- 1 root root 8,9K sept. 24 00:17 /var/cache/pacman/pkg/gnome-common-2.28.0-1-any.pkg.tar.gz /var/lib/pacman/sync/gnome-unstable/gnome-common-2.28.0-1/desc:%CSIZE% /var/lib/pacman/sync/gnome-unstable/gnome-common-2.28.0-1/desc-43 43 bytes instead of 8900 ? wtf ?

3 7

[pacman-dev] [PATCH] Some options were refactored
by Laszlo Papp 25 Sep '09

25 Sep '09

./src/pacman/pacman.h: - The defines were placed here that are used in the pacman.c source file ./src/pacman/pacman.c - Long options were refactored because of a safer and more comfortable programming style, instead of hard coding 10-15 or more integer value into the code Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/pacman.c | 56 +++++++++++++++++++++++++------------------------- src/pacman/pacman.h | 16 ++++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ac51502..2d806d4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -378,20 +378,20 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"noconfirm", no_argument, 0, 1000}, - {"config", required_argument, 0, 1001}, - {"ignore", required_argument, 0, 1002}, - {"debug", optional_argument, 0, 1003}, - {"noprogressbar", no_argument, 0, 1004}, - {"noscriptlet", no_argument, 0, 1005}, - {"ask", required_argument, 0, 1006}, - {"cachedir", required_argument, 0, 1007}, - {"asdeps", no_argument, 0, 1008}, - {"logfile", required_argument, 0, 1009}, - {"ignoregroup", required_argument, 0, 1010}, - {"needed", no_argument, 0, 1011}, - {"asexplicit", no_argument, 0, 1012}, - {"arch", required_argument, 0, 1013}, + {"noconfirm", no_argument, 0, NOCONFIRM_OPTID}, + {"config", required_argument, 0, CONFIG_OPTID}, + {"ignore", required_argument, 0, IGNORE_OPTID}, + {"debug", optional_argument, 0, DEBUG_OPTID}, + {"noprogressbar", no_argument, 0, NOPROGRESSBAR_OPTID}, + {"noscriptlet", no_argument, 0, NOSCRIPTLET_OPTID}, + {"ask", required_argument, 0, ASK_OPTID}, + {"cachedir", required_argument, 0, CACHEDIR_OPTID}, + {"asdeps", no_argument, 0, ASDEPS_OPTID}, + {"logfile", required_argument, 0, LOGFILE_OPTID}, + {"ignoregroup", required_argument, 0, IGNOREGROUP_OPTID}, + {"needed", no_argument, 0, NEEDED_OPTID}, + {"asexplicit", no_argument, 0, ASEXPLICIT_OPTID}, + {"arch", required_argument, 0, ARCH_OPTID}, {0, 0, 0, 0} }; @@ -403,21 +403,21 @@ static int parseargs(int argc, char *argv[]) } switch(opt) { case 0: break; - case 1000: config->noconfirm = 1; break; - case 1001: + case NOCONFIRM_OPTID: config->noconfirm = 1; break; + case CONFIG_OPTID: if(config->configfile) { free(config->configfile); } config->configfile = strndup(optarg, PATH_MAX); break; - case 1002: + case IGNORE_OPTID: 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: + case DEBUG_OPTID: /* debug levels are made more 'human readable' than using a raw logmask * here, error and warning are set in config_new, though perhaps a * --quiet option will remove these later */ @@ -440,34 +440,34 @@ static int parseargs(int argc, char *argv[]) /* progress bars get wonky with debug on, shut them off */ config->noprogressbar = 1; break; - case 1004: config->noprogressbar = 1; break; - case 1005: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; - case 1006: config->noask = 1; config->ask = atoi(optarg); break; - case 1007: + case NOPROGRESSBAR_OPTID: config->noprogressbar = 1; break; + case NOSCRIPTLET_OPTID: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; + case ASK_OPTID: config->noask = 1; config->ask = atoi(optarg); break; + case CACHEDIR_OPTID: if(alpm_option_add_cachedir(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"), optarg, alpm_strerrorlast()); return(1); } break; - case 1008: + case ASDEPS_OPTID: config->flags |= PM_TRANS_FLAG_ALLDEPS; break; - case 1009: + case LOGFILE_OPTID: config->logfile = strndup(optarg, PATH_MAX); break; - case 1010: + case IGNOREGROUP_OPTID: 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 1011: config->flags |= PM_TRANS_FLAG_NEEDED; break; - case 1012: + case NEEDED_OPTID: config->flags |= PM_TRANS_FLAG_NEEDED; break; + case ASEXPLICIT_OPTID: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; - case 1013: + case ARCH_OPTID: setarch(optarg); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index d7cb50f..f278e49 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -22,6 +22,22 @@ #include <alpm_list.h> +#define NOCONFIRM_OPTID 1000 +#define CONFIG_OPTID 1001 +#define IGNORE_OPTID 1002 +#define DEBUG_OPTID 1003 +#define NOPROGRESSBAR_OPTID 1004 +#define NOSCRIPTLET_OPTID 1005 +#define ASK_OPTID 1006 +#define CACHEDIR_OPTID 1007 +#define ASDEPS_OPTID 1008 +#define LOGFILE_OPTID 1009 +#define IGNOREGROUP_OPTID 1010 +#define NEEDED_OPTID 1011 +#define ASEXPLICIT_OPTID 1012 +#define ARCH_OPTID 1013 + + /* query.c */ int pacman_query(alpm_list_t *targets); /* remove.c */ -- 1.6.4.4

4 4

[pacman-dev] Empty repo databases
by Allan McRae 24 Sep '09

24 Sep '09

Hi, With the community-testing repo now being empty, I get the following: > pacman -Syu :: Synchronizing package databases... kernel64 is up to date testing 10.3K 21.2K/s 00:00:00 [#####################] 100% core 33.8K 34.8K/s 00:00:01 [#####################] 100% extra 429.2K 13.0K/s 00:00:33 [#####################] 100% error: failed retrieving file 'community-testing.db.tar.gz' from <"mirror"> : Not Found error: failed to update community-testing (Not Found) community 365.3K 10.2K/s 00:00:36 [#####################] 100% :: Starting full system upgrade... local database is up to date Can we leave a shell database somehow when using repo-rm on the last package? It seems [testing] has never been empty! Allan

5 8

[pacman-dev] [PATCH] Separate file parsing from backend
by Henning Garus 23 Sep '09

23 Sep '09

Split the huge list of else ifs which was used for parsing 'desc', 'depends', 'files' and 'deltas' files, into separate functions and move them to a new file parse.c . This makes it possible for other backends to share the same parse code. Also change the parsing from the giant else if list to a single loop calling different functions as specified in an array of parser structs (see parse_lines() for details). Move _alpm_delta_parse to parse.c and make it static. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- I actually managed to make it longer, instead of shorter (well if you take out comments and license headers this version is roughly as long as the old one), however I think it is more readable. Feel free to call it overkill though. I don't really like the ugets stuff I used to get the next line, but I wanted this to work on something other than FILE*, even though this is not used (yet), and this was the best thing I could come up with. I toyed around with using fopencookie, but that sucks when it comes to portability (there is funopen on bsd, beyond that you are simply screwed). I removed the memset for the line array, it should be fairly safe and I ran valgrind with several pactests and it did not shout at me (at least after I supressed the numerous leaks reported for bash). Btw, is there a reason why pacman uses two different file formats (line based in db files vs. keyword = value in .PKGINFO ? lib/libalpm/Makefile.am | 1 + lib/libalpm/be_files.c | 222 +++++----------------------------- lib/libalpm/delta.c | 56 --------- lib/libalpm/delta.h | 1 - lib/libalpm/parse.c | 305 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/parse.h | 40 ++++++ 6 files changed, 377 insertions(+), 248 deletions(-) create mode 100644 lib/libalpm/parse.c create mode 100644 lib/libalpm/parse.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..5ed8866 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -27,6 +27,7 @@ libalpm_la_SOURCES = \ backup.h backup.c \ be_files.c \ be_package.c \ + parse.h parse.c \ cache.h cache.c \ conflict.h conflict.c \ db.h db.c \ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 21533ef..1066b60 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -31,7 +31,6 @@ #include <ctype.h> #include <time.h> #include <limits.h> /* PATH_MAX */ -#include <locale.h> /* setlocale */ /* libalpm */ #include "db.h" @@ -42,9 +41,9 @@ #include "alpm.h" #include "handle.h" #include "package.h" -#include "delta.h" #include "deps.h" #include "dload.h" +#include "parse.h" /* @@ -386,7 +385,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; - char line[513]; + char *pkgname = NULL; + char *pkgver = NULL; char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -417,9 +417,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); - /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); - pkgpath = get_pkgpath(db, info); if(access(pkgpath, F_OK)) { @@ -429,6 +426,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } + /* DESC */ if(inforeq & INFRQ_DESC) { snprintf(path, PATH_MAX, "%sdesc", pkgpath); @@ -436,139 +434,26 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - if(fgets(line, 256, fp) == NULL) { - break; - } - _alpm_strtrim(line); - if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->name) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->version) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } - } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } - } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } - } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } - } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); - /* also store this value to isize if isize is unset */ - if(info->isize == 0) { - info->isize = info->size; - } - } else if(strcmp(line, "%ISIZE%") == 0) { - /* ISIZE (installed size) tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%MD5SUM%") == 0) { - /* MD5SUM tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } - } else if(strcmp(line, "%FORCE%") == 0) { - info->force = 1; - } + STRDUP(pkgname, info->name, goto error); + STRDUP(pkgver, info->version, goto error); + if(_alpm_parse_desc(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } + if(strcmp(pkgname,info->name) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name mismatch " + "on package %s\n"), db->treename, pkgname); + } + if(strcmp(pkgver,info->version) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version mismatch " + "on package %s\n"), db->treename, pkgver); + } + FREE(pkgname); + FREE(pkgver); + /* store size in isize if isize is unset */ + if(info->isize == 0) { + info->isize = info->size; + } + fclose(fp); fp = NULL; } @@ -580,21 +465,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(fgets(line, 256, fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } - } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } - } + if(_alpm_parse_files(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -607,33 +479,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, 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, 512, 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) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } - } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } - } + if(_alpm_parse_depends(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -643,17 +490,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DELTAS) { snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - info->deltas = alpm_list_add(info->deltas, delta); - } - } - } + if(_alpm_parse_deltas(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -675,6 +513,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) return(0); error: + free(pkgname); + free(pkgver); free(pkgpath); if(fp) { fclose(fp); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 523968e..5202e4b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -25,7 +25,6 @@ #include <stdint.h> /* intmax_t */ #include <limits.h> #include <sys/types.h> -#include <regex.h> /* libalpm */ #include "delta.h" @@ -247,61 +246,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } -/** Parses the string representation of a pmdelta_t object. - * This function assumes that the string is in the correct format. - * This format is as follows: - * $deltafile $deltamd5 $deltasize $oldfile $newfile - * @param line the string to parse - * @return A pointer to the new pmdelta_t object - */ -/* TODO this does not really belong here, but in a parsing lib */ -pmdelta_t *_alpm_delta_parse(char *line) -{ - pmdelta_t *delta; - char *tmp = line, *tmp2; - regex_t reg; - - regcomp(&reg, - "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" - " [^[:space:]]* [^[:space:]]*$", - REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - if(regexec(&reg, line, 0, 0, 0) != 0) { - /* delta line is invalid, return NULL */ - regfree(&reg); - return(NULL); - } - regfree(&reg); - - CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); - - return(delta); -} - void _alpm_delta_free(pmdelta_t *delta) { FREE(delta->from); diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 4f426cb..3c4e4cf 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -39,7 +39,6 @@ struct __pmdelta_t { off_t download_size; }; -pmdelta_t *_alpm_delta_parse(char *line); void _alpm_delta_free(pmdelta_t *delta); off_t _alpm_shortest_delta_path(alpm_list_t *deltas, const char *to, alpm_list_t **path); diff --git a/lib/libalpm/parse.c b/lib/libalpm/parse.c new file mode 100644 index 0000000..31038fc --- /dev/null +++ b/lib/libalpm/parse.c @@ -0,0 +1,305 @@ +/* + * parse.c + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <locale.h> /* setlocale */ +#include <regex.h> +#include <time.h> + +/* libalpm */ +#include "parse.h" +#include "util.h" +#include "alpm_list.h" +#include "log.h" +#include "package.h" +#include "delta.h" +#include "deps.h" + +enum { + PARSE_FINISHED = 0, + PARSE_UNFINISHED = 1, + PARSE_ERROR = 2 +}; + +typedef struct parser { + char *keyword; + int (*func)(char*, void*); + void *saveto; +} parser_t; + +/** Parses the string representation of a pmdelta_t object. + * This function assumes that the string is in the correct format. + * This format is as follows: + * $deltafile $deltamd5 $deltasize $oldfile $newfile + * @param line the string to parse + * @return A pointer to the new pmdelta_t object + */ +static pmdelta_t *delta_parse(char *line) +{ + pmdelta_t *delta; + char *tmp = line, *tmp2; + regex_t reg; + + regcomp(&reg, + "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" + " [^[:space:]]* [^[:space:]]*$", + REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + if(regexec(&reg, line, 0, 0, 0) != 0) { + /* delta line is invalid, return NULL */ + regfree(&reg); + return(NULL); + } + regfree(&reg); + + CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + delta->delta_size = atol(tmp2); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); + + return(delta); +} + +/** Parse line based data, as found in desc, depends, files and deltas files + * The data is expected to be in the following format: + * keyword + * [entry] + * [entry] + * ... + * <newline> + * [keyword] + * ... + * + * The handling of the data for each keyword is described by the matching + * struct of type parser_t. This struct holds a function pointer and a void + * pointer for each keyword. The function is called for the lines following a + * keyword until it returns PARSE_FINISHED. It is expected to handle the actual + * parsing and store the data at the passed void pointer. + * @param parsers describes how to parse data for each keyword + * @param nparsers size of parsers + * @param ugets pointer to an fgets like function, which gets called to get + * the next line + * @param from describes from where to read the next line, this is passed to + * ugets + */ +static int parse_lines(parser_t parsers[], int nparsers, ugets_t ugets, + void *from) +{ + int i, ret; + char line[513]; + parser_t *p = NULL; + + while((*ugets)(line, sizeof(line) - 1, from) != NULL) { + _alpm_strtrim(line); + if(p == NULL && strlen(line) == 0) { + continue; + } + if(p == NULL) { + for(i = 0; i < nparsers; i++) { + if(strcmp(line,parsers[i].keyword) == 0) { + p = &parsers[i]; + } + } + } + else { + ret = (*(p->func))(line, p->saveto); + if(ret == PARSE_FINISHED) { + p = NULL; + } + else if(ret == PARSE_ERROR) { + return(ret); + } + } + } + return(0); +} + +static int copy_line(char *line, void *target) { + STRDUP(*(char**)target, line, return(PARSE_ERROR)); + return(PARSE_FINISHED); +} + +static int parse_off_t(char *line, void *target) { + *(off_t*)target = (off_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_reason(char *line, void *target) { + *(pmpkgreason_t*)target = (pmpkgreason_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_date(char *line, void *target) { + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *(time_t*)target = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *(time_t*)target = atol(line); + } + return(PARSE_FINISHED); +} + +static int set_flag(char *line, void *target) { + *(unsigned short*)target = 1; + return(PARSE_FINISHED); +} + +static int copy_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + char *linedup; + STRDUP(linedup, line, RET_ERR(PM_ERR_MEMORY, PARSE_ERROR)); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, linedup); + return(PARSE_UNFINISHED); +} + +static int deltas_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdelta_t *delta = delta_parse(line); + if(delta != NULL) { + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, delta); + } + return(PARSE_UNFINISHED); +} + +static int deps_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdepend_t *dep = _alpm_splitdep(line); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, dep); + return(PARSE_UNFINISHED); +} + +char *_alpm_parse_from_file(char *buf,int size, void* fp) +{ + return(fgets(buf, size, (FILE*)fp)); +} + +char *_alpm_parse_from_archive(char *buf,int size, void* a) +{ + return(_alpm_archive_fgets(buf, size, (struct archive*)a)); +} + + +int _alpm_parse_desc(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%NAME%", &copy_line, &pkg->name}, + {"%VERSION%", &copy_line, &pkg->version}, + {"%FILENAME%", &copy_line, &pkg->filename}, + {"%DESC%", &copy_line, &pkg->desc}, + {"%GROUPS%", &copy_to_list, &pkg->groups}, + {"%URL%", &copy_line, &pkg->url}, + {"%LICENSE%", &copy_to_list, &pkg->licenses}, + {"%ARCH%", &copy_line, &pkg->arch}, + {"%BUILDDATE%", &parse_date, &pkg->builddate}, + {"%INSTALLDATE%", &parse_date, &pkg->installdate}, + {"%PACKAGER%", &copy_line, &pkg->packager}, + {"%REASON%", &parse_reason, &pkg->reason}, + {"%SIZE%", &parse_off_t, &pkg->size}, + {"%CSIZE%", &parse_off_t, &pkg->size}, + {"%ISIZE%", &parse_off_t, &pkg->isize}, + {"%MD5SUM%", &copy_line, &pkg->md5sum}, + {"%REPLACES%", &copy_to_list, &pkg->replaces}, + {"%FORCE%", &set_flag, &pkg->force} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_files(ugets_t ugets, void* from, + pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%FILES%", &copy_to_list, &pkg->files}, + {"%BACKUP%", &copy_to_list, &pkg->backup} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_depends(char* (*ugets)(char*, int, void*), void *from, + pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DEPENDS%", &deps_to_list, &pkg->depends}, + {"%OPTDEPENDS%", &copy_to_list, &pkg->optdepends}, + {"%CONFLICTS%", &copy_to_list, &pkg->conflicts}, + {"%PROVIDES%", &copy_to_list, &pkg->provides} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_deltas(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DELTAS%", &deltas_to_list, &pkg->deltas} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/parse.h b/lib/libalpm/parse.h new file mode 100644 index 0000000..d3ef77e --- /dev/null +++ b/lib/libalpm/parse.h @@ -0,0 +1,40 @@ +/* + * parse.h + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _ALPM_PARSE_H +#define _ALPM_PARSE_H + +#include "package.h" + +/* An fgets like function, argument for the parse functions */ +typedef char *(*ugets_t)(char*, int, void*); + +/* arguments for the parse functions (ugets_t) */ +char *_alpm_parse_from_file(char*, int, void*); +char *_alpm_parse_from_archive(char*, int, void*); + +/* parse functions */ +int _alpm_parse_desc(ugets_t, void*, pmpkg_t*); +int _alpm_parse_files(ugets_t, void*, pmpkg_t*); +int _alpm_parse_depends(ugets_t, void*, pmpkg_t*); +int _alpm_parse_deltas(ugets_t, void*, pmpkg_t*); + +#endif /* _ALPM_PARSE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.6.4.4

2 4

[pacman-dev] [PATCH] Separate file parsing from backend
by Henning Garus 23 Sep '09

23 Sep '09

Split the huge list of else ifs which was used for parsing 'desc', 'depends', 'files' and 'deltas' files, into separate functions and move them to a new file parse.c . This makes it possible for other backends to share the same parse code. Also change the parsing from the giant else if list to a single loop calling different functions as specified in an array of parser structs (see parse_lines() for details). Move _alpm_delta_parse to parse.c and make it static. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- Fix a stupid memleak I introduced in be_files.c by copying pkgname and version. Change all functions in parse to follow code conventions. lib/libalpm/Makefile.am | 1 + lib/libalpm/be_files.c | 223 +++++----------------------------- lib/libalpm/delta.c | 56 --------- lib/libalpm/delta.h | 1 - lib/libalpm/parse.c | 311 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/parse.h | 40 ++++++ 6 files changed, 384 insertions(+), 248 deletions(-) create mode 100644 lib/libalpm/parse.c create mode 100644 lib/libalpm/parse.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..5ed8866 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -27,6 +27,7 @@ libalpm_la_SOURCES = \ backup.h backup.c \ be_files.c \ be_package.c \ + parse.h parse.c \ cache.h cache.c \ conflict.h conflict.c \ db.h db.c \ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 21533ef..d969609 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -31,7 +31,6 @@ #include <ctype.h> #include <time.h> #include <limits.h> /* PATH_MAX */ -#include <locale.h> /* setlocale */ /* libalpm */ #include "db.h" @@ -42,9 +41,9 @@ #include "alpm.h" #include "handle.h" #include "package.h" -#include "delta.h" #include "deps.h" #include "dload.h" +#include "parse.h" /* @@ -386,7 +385,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; - char line[513]; + char *pkgname = NULL; + char *pkgver = NULL; char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -417,9 +417,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); - /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); - pkgpath = get_pkgpath(db, info); if(access(pkgpath, F_OK)) { @@ -429,6 +426,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } + /* DESC */ if(inforeq & INFRQ_DESC) { snprintf(path, PATH_MAX, "%sdesc", pkgpath); @@ -436,139 +434,29 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - if(fgets(line, 256, fp) == NULL) { - break; - } - _alpm_strtrim(line); - if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->name) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->version) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } - } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } - } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } - } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } - } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); - /* also store this value to isize if isize is unset */ - if(info->isize == 0) { - info->isize = info->size; - } - } else if(strcmp(line, "%ISIZE%") == 0) { - /* ISIZE (installed size) tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%MD5SUM%") == 0) { - /* MD5SUM tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } - } else if(strcmp(line, "%FORCE%") == 0) { - info->force = 1; - } + /* name and version are already set and could be in use */ + pkgname = info->name; + pkgver = info->version; + if(_alpm_parse_desc(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } + if(strcmp(pkgname,info->name) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name mismatch " + "on package %s\n"), db->treename, pkgname); + } + if(strcmp(pkgver,info->version) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version mismatch " + "on package %s\n"), db->treename, pkgver); + } + free(info->name); + info->name = pkgname; + free(info->version); + info->version = pkgver; + /* store size in isize if isize is unset */ + if(info->isize == 0) { + info->isize = info->size; + } + fclose(fp); fp = NULL; } @@ -580,21 +468,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(fgets(line, 256, fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } - } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } - } + if(_alpm_parse_files(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -607,33 +482,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, 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, 512, 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) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } - } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } - } + if(_alpm_parse_depends(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -643,17 +493,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DELTAS) { snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - info->deltas = alpm_list_add(info->deltas, delta); - } - } - } + if(_alpm_parse_deltas(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 523968e..5202e4b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -25,7 +25,6 @@ #include <stdint.h> /* intmax_t */ #include <limits.h> #include <sys/types.h> -#include <regex.h> /* libalpm */ #include "delta.h" @@ -247,61 +246,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } -/** Parses the string representation of a pmdelta_t object. - * This function assumes that the string is in the correct format. - * This format is as follows: - * $deltafile $deltamd5 $deltasize $oldfile $newfile - * @param line the string to parse - * @return A pointer to the new pmdelta_t object - */ -/* TODO this does not really belong here, but in a parsing lib */ -pmdelta_t *_alpm_delta_parse(char *line) -{ - pmdelta_t *delta; - char *tmp = line, *tmp2; - regex_t reg; - - regcomp(&reg, - "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" - " [^[:space:]]* [^[:space:]]*$", - REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - if(regexec(&reg, line, 0, 0, 0) != 0) { - /* delta line is invalid, return NULL */ - regfree(&reg); - return(NULL); - } - regfree(&reg); - - CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); - - return(delta); -} - void _alpm_delta_free(pmdelta_t *delta) { FREE(delta->from); diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 4f426cb..3c4e4cf 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -39,7 +39,6 @@ struct __pmdelta_t { off_t download_size; }; -pmdelta_t *_alpm_delta_parse(char *line); void _alpm_delta_free(pmdelta_t *delta); off_t _alpm_shortest_delta_path(alpm_list_t *deltas, const char *to, alpm_list_t **path); diff --git a/lib/libalpm/parse.c b/lib/libalpm/parse.c new file mode 100644 index 0000000..de699bd --- /dev/null +++ b/lib/libalpm/parse.c @@ -0,0 +1,311 @@ +/* + * parse.c + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <locale.h> /* setlocale */ +#include <regex.h> +#include <time.h> + +/* libalpm */ +#include "parse.h" +#include "util.h" +#include "alpm_list.h" +#include "log.h" +#include "package.h" +#include "delta.h" +#include "deps.h" + +enum { + PARSE_FINISHED = 0, + PARSE_UNFINISHED = 1, + PARSE_ERROR = 2 +}; + +typedef struct parser { + char *keyword; + int (*func)(char*, void*); + void *saveto; +} parser_t; + +/** Parses the string representation of a pmdelta_t object. + * This function assumes that the string is in the correct format. + * This format is as follows: + * $deltafile $deltamd5 $deltasize $oldfile $newfile + * @param line the string to parse + * @return A pointer to the new pmdelta_t object + */ +static pmdelta_t *delta_parse(char *line) +{ + pmdelta_t *delta; + char *tmp = line, *tmp2; + regex_t reg; + + regcomp(&reg, + "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" + " [^[:space:]]* [^[:space:]]*$", + REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + if(regexec(&reg, line, 0, 0, 0) != 0) { + /* delta line is invalid, return NULL */ + regfree(&reg); + return(NULL); + } + regfree(&reg); + + CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + delta->delta_size = atol(tmp2); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); + + return(delta); +} + +/** Parse line based data, as found in desc, depends, files and deltas files + * The data is expected to be in the following format: + * keyword + * [entry] + * [entry] + * ... + * <newline> + * [keyword] + * ... + * + * The handling of the data for each keyword is described by the matching + * struct of type parser_t. This struct holds a function pointer and a void + * pointer for each keyword. The function is called for the lines following a + * keyword until it returns PARSE_FINISHED. It is expected to handle the actual + * parsing and store the data at the passed void pointer. + * @param parsers describes how to parse data for each keyword + * @param nparsers size of parsers + * @param ugets pointer to an fgets like function, which gets called to get + * the next line + * @param from describes from where to read the next line, this is passed to + * ugets + */ +static int parse_lines(parser_t parsers[], int nparsers, ugets_t ugets, + void *from) +{ + int i, ret; + char line[513]; + parser_t *p = NULL; + + while((*ugets)(line, sizeof(line) - 1, from) != NULL) { + _alpm_strtrim(line); + if(p == NULL && strlen(line) == 0) { + continue; + } + if(p == NULL) { + for(i = 0; i < nparsers; i++) { + if(strcmp(line,parsers[i].keyword) == 0) { + p = &parsers[i]; + } + } + } + else { + ret = (*(p->func))(line, p->saveto); + if(ret == PARSE_FINISHED) { + p = NULL; + } + else if(ret == PARSE_ERROR) { + return(ret); + } + } + } + return(0); +} + +static int copy_line(char *line, void *target) +{ + STRDUP(*(char**)target, line, return(PARSE_ERROR)); + return(PARSE_FINISHED); +} + +static int parse_off_t(char *line, void *target) +{ + *(off_t*)target = (off_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_reason(char *line, void *target) +{ + *(pmpkgreason_t*)target = (pmpkgreason_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_date(char *line, void *target) +{ + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *(time_t*)target = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *(time_t*)target = atol(line); + } + return(PARSE_FINISHED); +} + +static int set_flag(char *line, void *target) +{ + *(unsigned short*)target = 1; + return(PARSE_FINISHED); +} + +static int copy_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + char *linedup; + STRDUP(linedup, line, RET_ERR(PM_ERR_MEMORY, PARSE_ERROR)); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, linedup); + return(PARSE_UNFINISHED); +} + +static int deltas_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdelta_t *delta = delta_parse(line); + if(delta != NULL) { + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, delta); + } + return(PARSE_UNFINISHED); +} + +static int deps_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdepend_t *dep = _alpm_splitdep(line); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, dep); + return(PARSE_UNFINISHED); +} + +char *_alpm_parse_from_file(char *buf,int size, void* fp) +{ + return(fgets(buf, size, (FILE*)fp)); +} + +char *_alpm_parse_from_archive(char *buf,int size, void* a) +{ + return(_alpm_archive_fgets(buf, size, (struct archive*)a)); +} + + +int _alpm_parse_desc(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%NAME%", &copy_line, &pkg->name}, + {"%VERSION%", &copy_line, &pkg->version}, + {"%FILENAME%", &copy_line, &pkg->filename}, + {"%DESC%", &copy_line, &pkg->desc}, + {"%GROUPS%", &copy_to_list, &pkg->groups}, + {"%URL%", &copy_line, &pkg->url}, + {"%LICENSE%", &copy_to_list, &pkg->licenses}, + {"%ARCH%", &copy_line, &pkg->arch}, + {"%BUILDDATE%", &parse_date, &pkg->builddate}, + {"%INSTALLDATE%", &parse_date, &pkg->installdate}, + {"%PACKAGER%", &copy_line, &pkg->packager}, + {"%REASON%", &parse_reason, &pkg->reason}, + {"%SIZE%", &parse_off_t, &pkg->size}, + {"%CSIZE%", &parse_off_t, &pkg->size}, + {"%ISIZE%", &parse_off_t, &pkg->isize}, + {"%MD5SUM%", &copy_line, &pkg->md5sum}, + {"%REPLACES%", &copy_to_list, &pkg->replaces}, + {"%FORCE%", &set_flag, &pkg->force} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_files(ugets_t ugets, void* from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%FILES%", &copy_to_list, &pkg->files}, + {"%BACKUP%", &copy_to_list, &pkg->backup} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_depends(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DEPENDS%", &deps_to_list, &pkg->depends}, + {"%OPTDEPENDS%", &copy_to_list, &pkg->optdepends}, + {"%CONFLICTS%", &copy_to_list, &pkg->conflicts}, + {"%PROVIDES%", &copy_to_list, &pkg->provides} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_deltas(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DELTAS%", &deltas_to_list, &pkg->deltas} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/parse.h b/lib/libalpm/parse.h new file mode 100644 index 0000000..d3ef77e --- /dev/null +++ b/lib/libalpm/parse.h @@ -0,0 +1,40 @@ +/* + * parse.h + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _ALPM_PARSE_H +#define _ALPM_PARSE_H + +#include "package.h" + +/* An fgets like function, argument for the parse functions */ +typedef char *(*ugets_t)(char*, int, void*); + +/* arguments for the parse functions (ugets_t) */ +char *_alpm_parse_from_file(char*, int, void*); +char *_alpm_parse_from_archive(char*, int, void*); + +/* parse functions */ +int _alpm_parse_desc(ugets_t, void*, pmpkg_t*); +int _alpm_parse_files(ugets_t, void*, pmpkg_t*); +int _alpm_parse_depends(ugets_t, void*, pmpkg_t*); +int _alpm_parse_deltas(ugets_t, void*, pmpkg_t*); + +#endif /* _ALPM_PARSE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.6.4.4

1 0

[pacman-dev] cygwin and pactest weirdness
by Xavier 23 Sep '09

23 Sep '09

For the last few months, I have been getting random failures, at almost every make check run. For example : ================================================================================ Running 'sync042' Install a sync package conflicting with a local one -------------------------------------------------------------------------------- ==> Generating test environment Traceback (most recent call last): File "./pactest/pactest.py", line 104, in <module> env.run() File "/divers/pacman/pactest/pmenv.py", line 71, in run t.generate() File "/divers/pacman/pactest/pmtest.py", line 108, in generate shutil.rmtree(self.root) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 178, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/usr/lib/python2.5/shutil.py", line 176, in rmtree os.rmdir(path) OSError: [Errno 90] Directory not empty: '/divers/pacman/root/var/lib/pacman/sync/sync/pkg1-1.0-1' make[2]: *** [check-local] Error 1 make[2]: Leaving directory `/divers/pacman' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/divers/pacman' make: *** [check-recursive] Error 1 make check 300.15s user 425.34s system 98% cpu 12:15.82 total $ ls /divers/pacman/root/var/lib/pacman/sync/sync/* /divers/pacman/root/var/lib/pacman/sync/sync/pkg1-1.0-1: /divers/pacman/root/var/lib/pacman/sync/sync/pkg2-1.0-1: depends desc It looks like pkg1 directory is actually empty afterward. So it looks like some odd race conditions. I am not sure what triggered it. Maybe I did a python update. Or my system/disk became slower. I don't really know, but it's quite annoying, and I am not sure what to do. I guess I should try to write a minimal testcase, like a python script creating and removing a bunch of files, see if I can reproduce it.

1 0

Re: [pacman-dev] [arch-general] Looking for czech and simplified chinese speakers for a quick pacman translation update
by Xavier 23 Sep '09

23 Sep '09

On Wed, Sep 23, 2009 at 3:21 PM, 甘露(Gan Lu) <rhythm.gan(a)gmail.com> wrote: > Sorry for being late, I am occupied by really busy life, haven't > checked my mail for days. > Don't worry, the only consequence is that 3.3.1 will have ~10 untranslated messages which will appear in English :) No big deal. Hopefully you will have time to catch up later on or to find an assistant :)

1 0

[pacman-dev] [translations] Add Swedish translation
by Laszlo Papp 23 Sep '09

23 Sep '09

Hello! Swedish translation is available here: http://djszapi.homelinux.net/0001-Add-Swedish-translation.patch Best regards, Laszlo Papp

3 5

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.1
by dan＠archlinux.org 23 Sep '09

23 Sep '09

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, maint has been updated via 7cead800c52e635d7f5010875cd8fcf99b93f4b2 (commit) via e76b3374d8372391b0cfefee829a660ccaba0d47 (commit) via 802b1a6f2f01b655c0ba46d3bafff9c5196c0542 (commit) via cfb86fed7cfa0f7b4a60a33bc203b0277a292ae4 (commit) via 38ac020f51ff248901d0455b6b5bd4260fa4f530 (commit) from 9c13a6c364e4b34cbec47cf0522707c8f5dfb856 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 1 + TRANSLATORS | 9 +- doc/index.txt | 1 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/cs.po | 24 +- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/en_GB.po | 6 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb_NO.po | 4 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt_BR.po | 31 +- lib/libalpm/po/ro.po | 6 +- lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/{nb_NO.po => sv_SE.po} | 288 +++++----- lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 6 +- po/LINGUAS | 1 + po/cs.po | 35 +- po/de.po | 6 +- po/en_GB.po | 6 +- po/es.po | 6 +- po/fr.po | 6 +- po/hu.po | 6 +- po/it.po | 6 +- po/kk.po | 6 +- po/nb_NO.po | 4 +- po/pacman.pot | 4 +- po/pl.po | 6 +- po/pt_BR.po | 39 +- po/ro.po | 6 +- po/ru.po | 6 +- po/{nb_NO.po => sv_SE.po} | 998 +++++++++++++++++---------------- po/tr.po | 6 +- po/uk.po | 6 +- po/zh_CN.po | 6 +- 41 files changed, 802 insertions(+), 794 deletions(-) copy lib/libalpm/po/{nb_NO.po => sv_SE.po} (53%) copy po/{nb_NO.po => sv_SE.po} (52%) hooks/post-receive -- The official pacman repository

1 0