- Pacman-dev - lists.archlinux.org

[pacman-dev] [Translation] Updated Romanian Translation (Volodia Macovei)
by volodia macovei 17 Sep '09

17 Sep '09

The updated Romanian translation... One archive with 2 files: libalpm_ro.po and pacman_ro.po Thanks

2 2

[pacman-dev] [translation] Updated de-Version
by Matthias Gorissen 17 Sep '09

17 Sep '09

Here we go again ... Best regards, Matt

2 1

[pacman-dev] [Translations] update spanish translation
by Juan Pablo González Tognarelli 17 Sep '09

17 Sep '09

Hello guys! congratulations for a fast update to pacman! the spanish spanish translations (with fixes) is attached. greetings to everyone!

2 1

[pacman-dev] [Translations] Hungarian translation for 3.3.1
by Nagy Gabor 17 Sep '09

17 Sep '09

The translation is attached.

2 1

[pacman-dev] Turkish translation update
by Samed Beyribey 17 Sep '09

17 Sep '09

Hello, Here's the Turkish translation updated for the 3.3.1 Regards, Samed.

2 1

[pacman-dev] [Translations] Updated Kazakh Translation
by Baurzhan Muftakhidinov 17 Sep '09

17 Sep '09

Hi all Updated version is attached Thanks

3 5

[pacman-dev] [Translations] NEW update Italian translation
by Giovanni Scafora 17 Sep '09

17 Sep '09

Hello guys, here's the NEW update Italian translation for pacman 3.3.1 Please, DO NOT use my previous translation. Use this in attachment. Thank you! -- Arch Linux Developer http://www.archlinux.org http://www.archlinux.it

1 0

[pacman-dev] Pacman 3.3.1 release?
by Dan McGee 17 Sep '09

17 Sep '09

Any blockers or objections to going with what we pretty much have right now? We'll need a (short) translation period of course as we updated and added some messages, but I can't think of much else. -Dan

6 14

[pacman-dev] [Translations] Update Italian translation
by Giovanni Scafora 17 Sep '09

17 Sep '09

Hello, here's the update Italian translation for pacman 3.3.1 Regards, -- Arch Linux Developer http://www.archlinux.org http://www.archlinux.it

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-29-ged9d459
by dan＠archlinux.org 17 Sep '09

17 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 ed9d459ee2e0f44ad6365b2027db1486363b649e (commit) from 922448a9bf097ccdca176e952c240a1e4ca69992 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed9d459ee2e0f44ad6365b2027db1486363b649e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 16 20:42:42 2009 -0500 Updates in prep for 3.3.1 release Bump versions in configure.ac; update NEWS accordingly Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++++++++ configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-28-g922448a
by dan＠archlinux.org 17 Sep '09

17 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 922448a9bf097ccdca176e952c240a1e4ca69992 (commit) via 9d4448dc7f559a3048f270f439927f67dbbfd5df (commit) via 9505c594fd1b32c768ccffcd77808049ea6491e4 (commit) via 1df3b91931ea28fa6b279a976339f099a111238d (commit) via 08ee4059b5935ab0b378a40dcfb127f169e96f83 (commit) from d0d6c58c0579ec4d6ada9a9f91acc93215ca2773 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 922448a9bf097ccdca176e952c240a1e4ca69992 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 16 19:44:01 2009 -0500 Update en_GB translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d4448dc7f559a3048f270f439927f67dbbfd5df Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Sep 17 02:21:53 2009 +0200 Update french translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9505c594fd1b32c768ccffcd77808049ea6491e4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Sep 17 02:07:42 2009 +0200 Update all pot and po files for 3.3.1 release Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1df3b91931ea28fa6b279a976339f099a111238d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Sep 17 02:03:23 2009 +0200 String improvements Add more untranslated strings, improve consistency, etc. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 08ee4059b5935ab0b378a40dcfb127f169e96f83 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Sep 15 12:55:19 2009 +0200 Catch an untranslated warning in lib/remove.c Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 ++-- lib/libalpm/be_files.c | 2 +- lib/libalpm/po/cs.po | 22 +++++++++++++++------- lib/libalpm/po/de.po | 22 +++++++++++++++------- lib/libalpm/po/en_GB.po | 26 +++++++++++++++++--------- lib/libalpm/po/es.po | 24 +++++++++++++++++------- lib/libalpm/po/fr.po | 20 ++++++++++++++------ lib/libalpm/po/hu.po | 22 +++++++++++++++------- lib/libalpm/po/it.po | 23 ++++++++++++++++------- lib/libalpm/po/kk.po | 23 ++++++++++++++++------- lib/libalpm/po/libalpm.pot | 16 ++++++++++++---- lib/libalpm/po/pl.po | 22 +++++++++++++++------- lib/libalpm/po/pt_BR.po | 22 +++++++++++++++------- lib/libalpm/po/ro.po | 22 +++++++++++++++------- lib/libalpm/po/ru.po | 22 +++++++++++++++------- lib/libalpm/po/tr.po | 22 +++++++++++++++------- lib/libalpm/po/uk.po | 22 +++++++++++++++------- lib/libalpm/po/zh_CN.po | 22 +++++++++++++++------- lib/libalpm/remove.c | 10 +++++----- po/cs.po | 34 +++++++++++++++++++++++++++------- po/de.po | 34 +++++++++++++++++++++++++++------- po/en_GB.po | 38 +++++++++++++++++++++++++++----------- po/es.po | 35 ++++++++++++++++++++++++++++------- po/fr.po | 40 ++++++++++++++++++++++++++++++---------- po/hu.po | 35 ++++++++++++++++++++++++++++------- po/it.po | 34 +++++++++++++++++++++++++++------- po/kk.po | 36 +++++++++++++++++++++++++++++------- po/pacman.pot | 27 ++++++++++++++++++++++----- po/pl.po | 34 +++++++++++++++++++++++++++------- po/pt_BR.po | 34 +++++++++++++++++++++++++++------- po/ro.po | 35 ++++++++++++++++++++++++++++------- po/ru.po | 36 +++++++++++++++++++++++++++++------- po/tr.po | 34 +++++++++++++++++++++++++++------- po/uk.po | 34 +++++++++++++++++++++++++++------- po/zh_CN.po | 34 +++++++++++++++++++++++++++------- scripts/makepkg.sh.in | 2 +- src/pacman/pacman.c | 6 +++--- src/pacman/query.c | 4 ++-- src/pacman/sync.c | 2 +- 39 files changed, 694 insertions(+), 242 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] translation of manual pages
by Laszlo Papp 16 Sep '09

16 Sep '09

Hello! Is translation of manual pages supported in pacman development ? I ask this, because I don't see any man pages apart from English. The french translation can be seen here e.g.: http://aur.archlinux.org/packages.php?ID=11180 I would deal with the hungarian manpages in the future, if you support it :) Best Regards, Laszlo Papp

2 2

[pacman-dev] [PATCH] Strndup usage and small typo fix
by Laszlo Papp 16 Sep '09

16 Sep '09

./src/pacman/package.c: - small typo fix ./src/pacman/pacman.c: - strdup is changed to strndup, because it's safer like in case of config option Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/package.c | 2 +- src/pacman/pacman.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 328d5bf..3b14516 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -84,7 +84,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) } if(level>0) { - /* compute this here so we don't get a puase in the middle of output */ + /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 64598b0..5335c7d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -454,7 +454,7 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_ALLDEPS; break; case 1009: - config->logfile = strdup(optarg); + config->logfile = strndup(optarg, PATH_MAX); break; case 1010: list = strsplit(optarg, ','); -- 1.6.4.1

1 0

[pacman-dev] A possible way to improve pacman's provision selection
by Nagy Gabor 16 Sep '09

16 Sep '09

Hi! This discussion is motivated by FS#16117. First of all, I know that "pacman -Sy foo" is not recommended, only "pacman -Syu foo" (see commit f53d9ba), but it is still allowed by pacman (which is distro independent), so I must mention the following situation: ---sync405.py--- self.description = "Choice between provider and literal" sp1 = pmpkg("pkg") sp1.depends = ["dep>=2.0"] self.addpkg2db("sync", sp1) sp2 = pmpkg("dep", "2.0-1") self.addpkg2db("sync", sp2) sp3 = pmpkg("dep-ng", "2.0-1") sp3.provides = ["dep=2.0"] sp3.conflicts = ["dep"] self.addpkg2db("sync", sp3) lp = pmpkg("dep-ng") lp.provides = ["dep"] lp.conflicts = ["dep"] self.addpkg2db("local", lp) self.args = "-S pkg" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg") self.addrule("!PKG_EXIST=dep") self.addrule("PKG_EXIST=dep-ng") self.addrule("PKG_VERSION=dep-ng|2.0-1") self.expectfailure = True ---------------- In this case we should clearly choose dep-ng dependency satisfier, because it has an older version installed. Unfortunately "computing all satisfiers then choosing" is much slower then "search for literal" (if provisions are not needed), so speed is a show-stopper here atm (like with FS#15500). Bye

2 1

[pacman-dev] [PATCH] Rename config option and small typo fix
by Laszlo Papp 16 Sep '09

16 Sep '09

./src/pacman/package.c: - small typo fix ./src/pacman/pacman.c: - config option is renamed to configfile, because it's more talkative like in case of logfile. - strdup is changed to strndup, because it's safer like in case of config option Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/package.c | 2 +- src/pacman/pacman.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 328d5bf..3b14516 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -84,7 +84,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) } if(level>0) { - /* compute this here so we don't get a puase in the middle of output */ + /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 64598b0..8a93fd8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -379,7 +379,7 @@ static int parseargs(int argc, char *argv[]) {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, {"noconfirm", no_argument, 0, 1000}, - {"config", required_argument, 0, 1001}, + {"configfile", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, {"debug", optional_argument, 0, 1003}, {"noprogressbar", no_argument, 0, 1004}, @@ -454,7 +454,7 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_ALLDEPS; break; case 1009: - config->logfile = strdup(optarg); + config->logfile = strndup(optarg, PATH_MAX); break; case 1010: list = strsplit(optarg, ','); -- 1.6.4.1

2 1

[pacman-dev] [PATCH] Ask user confirmation for -R operation, too
by Nagy Gabor 15 Sep '09

15 Sep '09

After commit 0da96abc, pacman always asks user confirmation for -U, so it is more coherent for doing that for -R, too. Btw, most users use -Rs always, so they won't notice any change. In the old code the -Ru operation was forgotten: Though it is not "dangerous", but the target list can be changed by that operation too. Non-interactive scripts should use --noconfirm always (unexpected questions can be asked by all transactions). [That's we should always default to the safest answers.] I also added a pkglist != NULL sanity check (because -Ru can empty target list in trans_prepare part). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/remove.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index ced4e12..6d44350 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -115,23 +115,19 @@ int pacman_remove(alpm_list_t *targets) goto cleanup; } - /* Warn user in case of dangerous operation */ - if(config->flags & PM_TRANS_FLAG_RECURSE || - config->flags & PM_TRANS_FLAG_CASCADE) { - /* list transaction targets */ - alpm_list_t *pkglist = alpm_trans_get_remove(); - - display_targets(pkglist, 0); - printf("\n"); - - /* get confirmation */ - if(yesno(_("Do you want to remove these packages?")) == 0) { - retval = 1; - goto cleanup; - } + /* Step 3: actually perform the removal */ + alpm_list_t *pkglist = alpm_trans_get_remove(); + if(pkglist == NULL) { + goto cleanup; /* we are done */ + } + /* print targets and ask user confirmation */ + display_targets(pkglist, 0); + printf("\n"); + if(yesno(_("Do you want to remove these packages?")) == 0) { + retval = 1; + goto cleanup; } - /* Step 3: actually perform the removal */ if(alpm_trans_commit(NULL) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); -- 1.6.4.3

4 3

[pacman-dev] [PATCH] Catch an untranslated warning in lib/remove.c
by Nagy Gabor 15 Sep '09

15 Sep '09

Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/remove.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index af2ce94..15ea069 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -136,7 +136,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, &vpkg); pkg = vpkg; if(pkg) { - _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", + _alpm_log(PM_LOG_WARNING, _("removing %s from the target-list\n"), alpm_pkg_get_name(pkg)); _alpm_pkg_free(pkg); } -- 1.6.4.3

2 1

[pacman-dev] [PATCH] Fully implement database lazy loading
by Dan McGee 15 Sep '09

15 Sep '09

Commit 34e1413d75 attempted to implement lazy loading of package databases. Although it took care of my main complaint (creating the database directory if it didn't exist), it didn't allow sync repos to be registered before alpm_option_set_dbpath() had been called. With this patch, we no longer compute the individual repository DB paths until necessary, allowing full lazy loading to work as intended, and allowing us to drop the extra setlibpath() calls from the frontend. This allows the changes introduced in a2cd48960 (but later reverted) to be added back in again. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 13 +++++---- lib/libalpm/be_files.c | 39 +++++++++++++++++++----------- lib/libalpm/db.c | 61 ++++++++++++++++++++++++++++------------------- lib/libalpm/db.h | 8 ++++-- lib/libalpm/remove.c | 4 +- src/pacman/pacman.c | 5 +--- 6 files changed, 75 insertions(+), 55 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 268ecd7..f035c59 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -132,13 +132,13 @@ static int extract_single_file(struct archive *archive, if(strcmp(entryname, ".INSTALL") == 0) { /* the install script goes inside the db */ - snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, - newpkg->name, newpkg->version); + snprintf(filename, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), newpkg->name, newpkg->version); archive_entry_set_perm(entry, 0644); } else if(strcmp(entryname, ".CHANGELOG") == 0) { /* the changelog goes inside the db */ - snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, - newpkg->name, newpkg->version); + snprintf(filename, PATH_MAX, "%s%s-%s/changelog", + _alpm_db_path(db), newpkg->name, newpkg->version); archive_entry_set_perm(entry, 0644); } else if(*entryname == '.') { /* for now, ignore all files starting with '.' that haven't @@ -483,8 +483,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, ALPM_LOG_FUNC; - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), alpm_pkg_get_name(newpkg), + alpm_pkg_get_version(newpkg)); /* see if this is an upgrade. if so, remove the old package first */ pmpkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 03a1463..cf51fc0 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -51,10 +51,11 @@ * Return the last update time as number of seconds from the epoch. * Returns 0 if the value is unknown or can't be read. */ -static time_t getlastupdate(const pmdb_t *db) +static time_t getlastupdate(pmdb_t *db) { FILE *fp; char *file; + const char *dbpath; time_t ret = 0; ALPM_LOG_FUNC; @@ -63,9 +64,10 @@ static time_t getlastupdate(const pmdb_t *db) return(ret); } - /* db->path + '.lastupdate' + NULL */ - MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", db->path); + dbpath = _alpm_db_path(db); + /* dbpath + '.lastupdate' + NULL */ + MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); + sprintf(file, "%s.lastupdate", dbpath); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { @@ -85,10 +87,11 @@ static time_t getlastupdate(const pmdb_t *db) /* * writes the dbpath/.lastupdate file with the value in time */ -static int setlastupdate(const pmdb_t *db, time_t time) +static int setlastupdate(pmdb_t *db, time_t time) { FILE *fp; char *file; + const char *dbpath; int ret = 0; ALPM_LOG_FUNC; @@ -97,9 +100,10 @@ static int setlastupdate(const pmdb_t *db, time_t time) return(-1); } - /* db->path + '.lastupdate' + NULL */ - MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", db->path); + dbpath = _alpm_db_path(db); + /* dbpath + '.lastupdate' + NULL */ + MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); + sprintf(file, "%s.lastupdate", dbpath); if((fp = fopen(file, "w")) == NULL) { free(file); @@ -116,7 +120,7 @@ static int setlastupdate(const pmdb_t *db, time_t time) static int checkdbdir(pmdb_t *db) { struct stat buf; - char *path = db->path; + const char *path = _alpm_db_path(db); if(stat(path, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", @@ -224,8 +228,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) _alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast()); return(-1); } else { + const char *syncdbpath = _alpm_db_path(db); /* remove the old dir */ - if(_alpm_rmrf(db->path) != 0) { + if(_alpm_rmrf(syncdbpath) != 0) { _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); RET_ERR(PM_ERR_DB_REMOVE, -1); } @@ -240,7 +245,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) /* uncompress the sync database */ checkdbdir(db); - ret = _alpm_unpack(dbfilepath, db->path, NULL); + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL); if(ret) { free(dbfilepath); RET_ERR(PM_ERR_SYSTEM, -1); @@ -305,13 +310,15 @@ int _alpm_db_populate(pmdb_t *db) struct dirent *ent = NULL; struct stat sbuf; char path[PATH_MAX]; + const char *dbpath; DIR *dbdir; ALPM_LOG_FUNC; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - dbdir = opendir(db->path); + dbpath = _alpm_db_path(db); + dbdir = opendir(dbpath); if(dbdir == NULL) { return(0); } @@ -323,7 +330,7 @@ int _alpm_db_populate(pmdb_t *db) continue; } /* stat the entry, make sure it's a directory */ - snprintf(path, PATH_MAX, "%s%s", db->path, name); + snprintf(path, PATH_MAX, "%s%s", dbpath, name); if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { continue; } @@ -366,10 +373,12 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) { size_t len; char *pkgpath; + const char *dbpath; - len = strlen(db->path) + strlen(info->name) + strlen(info->version) + 3; + dbpath = _alpm_db_path(db); + len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3; MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL)); - sprintf(pkgpath, "%s%s-%s/", db->path, info->name, info->version); + sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version); return(pkgpath); } diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 62c2e0a..e57ff93 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -323,18 +323,15 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) /** @} */ -pmdb_t *_alpm_db_new(const char *dbpath, const char *treename) +static pmdb_t *_alpm_db_new(const char *treename, unsigned short is_local) { pmdb_t *db; - const size_t pathsize = strlen(dbpath) + strlen(treename) + 2; ALPM_LOG_FUNC; CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL)); - CALLOC(db->path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); - - sprintf(db->path, "%s%s/", dbpath, treename); STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL)); + db->is_local = is_local; return(db); } @@ -347,13 +344,44 @@ void _alpm_db_free(pmdb_t *db) _alpm_db_free_pkgcache(db); /* cleanup server list */ FREELIST(db->servers); - FREE(db->path); + FREE(db->_path); FREE(db->treename); FREE(db); return; } +const char *_alpm_db_path(pmdb_t *db) +{ + if(!db) { + return(NULL); + } + if(!db->_path) { + const char *dbpath; + size_t pathsize; + + dbpath = alpm_option_get_dbpath(); + if(!dbpath) { + _alpm_log(PM_LOG_ERROR, _("database path is undefined\n")); + RET_ERR(PM_ERR_DB_OPEN, NULL); + } + + if(db->is_local) { + pathsize = strlen(dbpath) + strlen(db->treename) + 2; + CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); + sprintf(db->_path, "%s%s/", dbpath, db->treename); + } else { + pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2; + CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); + /* all sync DBs now reside in the sync/ subdir of the dbpath */ + sprintf(db->_path, "%ssync/%s/", dbpath, db->treename); + } + _alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n", + db->treename, db->_path); + } + return(db->_path); +} + int _alpm_db_cmp(const void *d1, const void *d2) { pmdb_t *db1 = (pmdb_t *)d1; @@ -440,7 +468,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) pmdb_t *_alpm_db_register_local(void) { pmdb_t *db; - const char *dbpath; ALPM_LOG_FUNC; @@ -451,13 +478,7 @@ pmdb_t *_alpm_db_register_local(void) _alpm_log(PM_LOG_DEBUG, "registering local database\n"); - dbpath = alpm_option_get_dbpath(); - if(!dbpath) { - _alpm_log(PM_LOG_ERROR, _("database path is undefined\n")); - RET_ERR(PM_ERR_DB_OPEN, NULL); - } - - db = _alpm_db_new(dbpath, "local"); + db = _alpm_db_new("local", 1); if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } @@ -469,8 +490,6 @@ pmdb_t *_alpm_db_register_local(void) pmdb_t *_alpm_db_register_sync(const char *treename) { pmdb_t *db; - const char *dbpath; - char path[PATH_MAX]; alpm_list_t *i; ALPM_LOG_FUNC; @@ -485,15 +504,7 @@ pmdb_t *_alpm_db_register_sync(const char *treename) _alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename); - dbpath = alpm_option_get_dbpath(); - if(!dbpath) { - _alpm_log(PM_LOG_ERROR, _("database path is undefined\n")); - RET_ERR(PM_ERR_DB_OPEN, NULL); - } - /* all sync DBs now reside in the sync/ subdir of the dbpath */ - snprintf(path, PATH_MAX, "%ssync/", dbpath); - - db = _alpm_db_new(path, treename); + db = _alpm_db_new(treename, 0); if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 950ace2..2981603 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -40,18 +40,20 @@ typedef enum _pmdbinfrq_t { /* Database */ struct __pmdb_t { - char *path; char *treename; + /* do not access directly, use _alpm_db_path(db) for lazy access */ + char *_path; unsigned short pkgcache_loaded; - alpm_list_t *pkgcache; unsigned short grpcache_loaded; + unsigned short is_local; + alpm_list_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; }; /* db.c, database general calls */ -pmdb_t *_alpm_db_new(const char *dbpath, const char *treename); void _alpm_db_free(pmdb_t *db); +const char *_alpm_db_path(pmdb_t *db); int _alpm_db_cmp(const void *d1, const void *d2); alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(void); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index af2ce94..dd54318 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -386,8 +386,8 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) /* get the name now so we can use it after package is removed */ pkgname = alpm_pkg_get_name(info); - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), pkgname, alpm_pkg_get_version(info)); EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); _alpm_log(PM_LOG_DEBUG, "removing package %s-%s\n", diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 64598b0..76511f4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -758,11 +758,8 @@ static int _parseconfig(const char *file, const char *givensection, ret = 1; goto cleanup; } - /* if we are not looking at the options section, register a db and also - * ensure we have set all of our library paths as the library is too stupid - * at the moment to do lazy opening of the databases */ + /* if we are not looking at the options section, register a db */ if(strcmp(section, "options") != 0) { - setlibpaths(); db = alpm_db_register_sync(section); if(db == NULL) { pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"), -- 1.6.4.3

2 3

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

15 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 d0d6c58c0579ec4d6ada9a9f91acc93215ca2773 (commit) via bc24c002fedc9a554c1fd6a9650f548ee55bd49c (commit) from a2cd48960e33043f75c81e0ecbc2d33b20b695fe (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: lib/libalpm/be_package.c | 2 ++ src/pacman/pacman.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-57-g95cb4b6
by dan＠archlinux.org 15 Sep '09

15 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, master has been updated via 95cb4b6874424c7109df0f8cebefc17d3756d65f (commit) via d0d6c58c0579ec4d6ada9a9f91acc93215ca2773 (commit) via bc24c002fedc9a554c1fd6a9650f548ee55bd49c (commit) via b4317a740ac2d4f5e4d1aa56a97171c52be70d02 (commit) via a2cd48960e33043f75c81e0ecbc2d33b20b695fe (commit) from 19e07eb8e84dd117061a600abdd9c8fed7391a07 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 95cb4b6874424c7109df0f8cebefc17d3756d65f Merge: b4317a740ac2d4f5e4d1aa56a97171c52be70d02 d0d6c58c0579ec4d6ada9a9f91acc93215ca2773 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 14 22:10:20 2009 -0500 Merge branch 'maint' commit b4317a740ac2d4f5e4d1aa56a97171c52be70d02 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 16 14:55:45 2009 +0200 Change the interface for target loading -int alpm_trans_sysupgrade(int enable_downgrade); -int alpm_trans_sync(char *target); -int alpm_trans_add(char *target); -int alpm_trans_remove(char *target); +int alpm_sync_sysupgrade(int enable_downgrade); +int alpm_sync_target(char *target); +int alpm_sync_dbtarget(char *db, char *target); +int alpm_add_target(char *target); +int alpm_remove_target(char *target); * functions renaming * add new sync_dbtarget which allows to specify the db * repo/ syntax handling is moved to frontend ( should implement FS#15141) * group handling is moved to backend ( see http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html ) ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 29 ++++++--- lib/libalpm/add.h | 1 - lib/libalpm/alpm.h | 10 ++- lib/libalpm/be_package.c | 2 + lib/libalpm/remove.c | 42 +++++++----- lib/libalpm/remove.h | 2 - lib/libalpm/sync.c | 164 +++++++++++++++++++++++++++++++++------------- lib/libalpm/sync.h | 3 - lib/libalpm/trans.c | 94 -------------------------- src/pacman/remove.c | 49 +++----------- src/pacman/sync.c | 76 +++++++--------------- src/pacman/upgrade.c | 2 +- 12 files changed, 207 insertions(+), 267 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [RFC] alpmtrigger: triggering events after all packages got installed...
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 13 Sep '09

13 Sep '09

Hello List, currently i'm working on adding a trigger infrastructure to libaplm/pacman to get rid of workload during upgrades or installations that runs more than a single time. Good examples for such jobs would be: - depmod after module installations - mkinitramfs after module installations - catalog-updates for fonts or infopages etc... My current plan is to create a helper script called "alpmtrigger" wich handles the work of setting the triggers and executing the triggers after pacman is done with installation. How would it work? Draft: A package that adds a trigger to the system installs a trigger script that do all the work needed into a "/usr/share/pacman/alpmtrigger" dir. inside of a packages install-helper we would call "alpmtrigger pkgtrigger" to set the trigger "pkgtrigger" active. alpmtrigger would do "touch /var/somewhere/alpmtrigger/pkgtrigger" wich would create the file if it not exists already. A hook to execute "alpmtrigger" (without params?) would need to be added after the _alpm_run_chroot(root, "/sbin/ldconfig"); call in function _alpm_ldconfig inside of lib/libalpm/util.c to actualy scan the contents of /var/somewhere/alpmtrigger, and for each filename in it check if /usr/share/pacman/alpmtrigger/filename exists and if it is and is executable run the trigger. After the trigger is done and retuned without error, the file /var/somewhere/alpmtrigger/filename gets removed. Any suggestions, comments or somebody else working on such a thing? Marc

6 30

[pacman-dev] [PATCH] Add makepkgopt to be_package.c
by Nagy Gabor 13 Sep '09

13 Sep '09

After commit 774c252 the --debug output shows 5-6 "syntax error..." lines for each package. After this patch pacman recognizes makepkgopt as a valid key, but doesn't do anything. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/be_package.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index fef4b46..9c7c161 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -112,6 +112,8 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) newpkg->provides = alpm_list_add(newpkg->provides, strdup(ptr)); } else if(!strcmp(key, "backup")) { newpkg->backup = alpm_list_add(newpkg->backup, strdup(ptr)); + } else if(!strcmp(key, "makepkgopt")) { + /* not used atm */ } else { _alpm_log(PM_LOG_DEBUG, "%s: syntax error in description file line %d\n", newpkg->name ? newpkg->name : "error", linenum); -- 1.6.4.2

2 1

[pacman-dev] [PATCH] Fix "-Sd conflict_pkg" bug
by Nagy Gabor 12 Sep '09

12 Sep '09

If the -d switch was invoked with -S (or -U), the removes list was simply lost, because trans->remove was computed in an "if(!(trans->flags & PM_TRANS_FLAG_NODEPS))" block. I've added a new pactest file, sync045.py (derived from sync043.py) to test this. Additionally, I did some other minor cleanups in sync_prepare: * preferred list is not needed anymore * I removed a needless alpm_list_remove_dupes line (the target list should not contain dupes at all) * I moved alpm_list_free(remove); to cleanup part to eliminate a possible memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 25 ++++++++++--------------- pactest/tests/sync045.py | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 pactest/tests/sync045.py diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index d676778..91da313 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -328,7 +328,6 @@ static int compute_download_size(pmpkg_t *newpkg) int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data) { alpm_list_t *deps = NULL; - alpm_list_t *preferred = NULL; alpm_list_t *unresolvable = NULL; alpm_list_t *i, *j; alpm_list_t *remove = NULL; @@ -351,32 +350,29 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); - /* build remove list and preferred list for resolvedeps */ + /* build remove list for resolvedeps */ for(i = trans->add; i; i = i->next) { pmpkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { remove = alpm_list_add(remove, j->data); } - preferred = alpm_list_add(preferred, spkg); } /* Resolve packages in the transaction one at a time, in addtion building up a list of packages which could not be resolved. */ for(i = trans->add; i; i = i->next) { pmpkg_t *pkg = i->data; - if(_alpm_resolvedeps(db_local, dbs_sync, pkg, preferred, + if(_alpm_resolvedeps(db_local, dbs_sync, pkg, trans->add, &resolved, remove, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [resolved] now additionally contains [pkg] and all of its dependencies not already on the list */ } - alpm_list_free(preferred); /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { - unresolvable = alpm_list_remove_dupes(unresolvable); int remove_unresolvable = 0; QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); @@ -536,17 +532,15 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync alpm_list_free(deps); } - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { - /* rebuild remove list */ - alpm_list_free(remove); - trans->remove = NULL; - for(i = trans->add; i; i = i->next) { - pmpkg_t *spkg = i->data; - for(j = spkg->removes; j; j = j->next) { - trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(j->data)); - } + /* Build trans->remove list */ + for(i = trans->add; i; i = i->next) { + pmpkg_t *spkg = i->data; + for(j = spkg->removes; j; j = j->next) { + trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(j->data)); } + } + if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { _alpm_log(PM_LOG_DEBUG, "checking dependencies\n"); deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, trans->remove, trans->add); if(deps) { @@ -572,6 +566,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync cleanup: alpm_list_free(unresolvable); + alpm_list_free(remove); return(ret); } diff --git a/pactest/tests/sync045.py b/pactest/tests/sync045.py new file mode 100644 index 0000000..574c0a5 --- /dev/null +++ b/pactest/tests/sync045.py @@ -0,0 +1,18 @@ +self.description = "Install a sync package conflicting with two local ones (-d)" + +sp = pmpkg("pkg1") +sp.conflicts = ["pkg2", "pkg3"] +self.addpkg2db("sync", sp); + +lp1 = pmpkg("pkg2") +self.addpkg2db("local", lp1); + +lp2 = pmpkg("pkg3") +self.addpkg2db("local", lp2); + +self.args = "-Sd %s --ask=4" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") -- 1.6.4.2

2 1

[pacman-dev] wiki trouble
by Jeff 12 Sep '09

12 Sep '09

I really hate that I'm sending to this list, but as this problem is a wiki / mail server issue and I can't find an explicitly relevant forum topic, mailing list, or flyspray category, I'm posting here. The wiki is trying to send out confirmation emails as wiki(a)web.archlinux.org which isn't a valid domain and is therefore rejected by my mail server. -- Jeff My other computer is an abacus.

1 0

[pacman-dev] Info pages install template(was: alpmtrigger: triggering events after all packages got installed...)
by Dan McGee 12 Sep '09

12 Sep '09

On Fri, Sep 11, 2009 at 8:27 AM, Allan McRae <allan(a)archlinux.org> wrote: > Given all we need to currently do for the install file for info pages is to > copy the prototype and list the info pages to install, you suggestion really > is no less work. On this note, the template has a rather unfortunate side effect in that it is not #!/bin/sh compatible, unless that happens to be linked to bash. Epic fail every time I install a package with info pages on my system that has /bin/sh linked to /bin/dash, it is really quite a shame... The shift crud left behind does not help the situation either. -Dan

3 2