[Frugalware-darcs] pacman: sync with upstream
VMiklos
vmiklos at frugalware.org
Thu Mar 16 17:47:14 CET 2006
[sync with upstream
VMiklos <vmiklos at frugalware.org>**20060129120420
2006-01-28 22:21 aurelien
* src/pacman/deptest.c: cleanup up error cases handling in
pacman_deptest
2006-01-28 06:07 judd
* src/pacman/: conf.h, download.c, pacman.c: added a
--noprogressbar switch for scripts to use
2006-01-28 05:48 judd
* lib/libalpm/: add.c, sync.c: Search through package provides if
no literal matches are found when scanning for targets with -S
2006-01-28 03:25 judd
* scripts/makeworld: makeworld sudo support
2006-01-28 03:24 judd
* scripts/makepkg: use sudo for -i if available (fw)
2006-01-27 20:21 aurelien
* lib/libalpm/add.c: improved log messages for add_commit
2006-01-27 20:12 aurelien
* lib/libalpm/db.c: cleaned up db_write error cases handling
2006-01-27 20:08 aurelien
* lib/libalpm/db.c: fixed potential file descriptor leaks
2006-01-27 20:02 aurelien
* src/pacman/deptest.c: added a missing error message in case of
lock failure
2006-01-27 20:02 aurelien
* src/pacman/: add.c, remove.c, sync.c: added missing retval values
in trans_release error cases
2006-01-27 00:48 judd
* scripts/makepkg: little fix for erroneous output
2006-01-26 23:18 aurelien
* lib/libalpm/add.c: fixed a compilation warning
2006-01-26 23:16 aurelien
* lib/libalpm/: alpm.c, alpm.h, util.c: reworked lock handling
(patch from VMiklos <vmiklos at frugalware.fr>)
2006-01-26 21:49 aurelien
* scripts/gensync: reordered group entry position in db_write (to
be in line with alpm/db_write)
2006-01-26 21:46 aurelien
* src/pacman/: add.c, remove.c, sync.c: - fixed a compilation
warning - added missing alpm_trans_release() calls upon
transation completion - put back error messages from pacman 2.x
in case of PM_ERR_HANDLE_LOCK error
2006-01-26 20:52 aurelien
* lib/libalpm/alpm.c: doxygen comments update (patch from VMiklos
<vmiklos at frugalware.org>)
] {
hunk ./lib/libalpm/add.c 689
+ _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'", tmpp->name, info->name);
hunk ./lib/libalpm/add.c 701
- _alpm_log(PM_LOG_FLOW2, "adding database entry %s", info->name);
+ _alpm_log(PM_LOG_FLOW2, "adding database entry '%s'", info->name);
hunk ./lib/libalpm/add.c 703
- _alpm_log(PM_LOG_ERROR, "could not update database entry %s-%s",
+ _alpm_log(PM_LOG_ERROR, "could not update database entry '%s-%s'",
hunk ./lib/libalpm/add.c 713
- _alpm_log(PM_LOG_FLOW2, "updating dependency packages 'requiredby' fields");
+ if(info->depends) {
+ _alpm_log(PM_LOG_FLOW2, "updating dependency packages 'requiredby' fields");
+ }
hunk ./lib/libalpm/add.c 735
- _alpm_log(PM_LOG_ERROR, "could not find dependency %s", depend.name);
+ _alpm_log(PM_LOG_ERROR, "could not find dependency '%s'", depend.name);
hunk ./lib/libalpm/add.c 740
+ _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'", info->name, depinfo->name);
hunk ./lib/libalpm/add.c 742
- _alpm_log(PM_LOG_DEBUG, "updating 'requiredby' field for package %s", depinfo->name);
hunk ./lib/libalpm/add.c 743
- _alpm_log(PM_LOG_ERROR, "could not update 'requiredby' database entry %s-%s",
+ _alpm_log(PM_LOG_ERROR, "could not update 'requiredby' database entry '%s-%s'",
hunk ./lib/libalpm/alpm.c 257
- * @return a char* on success (the value), NULL on error
+ * @return a void* on success (the value), NULL on error
hunk ./lib/libalpm/alpm.c 670
- if(handle->access == PM_ACCESS_RW) {
- handle->lckfd = _alpm_lckmk(PM_LOCK);
- if(handle->lckfd == -1) {
- FREE(handle);
- RET_ERR(PM_ERR_HANDLE_LOCK, -1);
- }
+ handle->lckfd = _alpm_lckmk(PM_LOCK);
+ if(handle->lckfd == -1) {
+ RET_ERR(PM_ERR_HANDLE_LOCK, -1);
hunk ./lib/libalpm/alpm.c 778
- if(handle->access == PM_ACCESS_RW) {
- if(handle->lckfd != -1) {
- close(handle->lckfd);
- handle->lckfd = -1;
- }
- if(_alpm_lckrm(PM_LOCK)) {
- _alpm_log(PM_LOG_WARNING, "could not remove lock file %s", PM_LOCK);
- alpm_logaction("warning: could not remove lock file %s", PM_LOCK);
- }
+ if(handle->lckfd != -1) {
+ close(handle->lckfd);
+ handle->lckfd = -1;
+ }
+ if(_alpm_lckrm(PM_LOCK)) {
+ _alpm_log(PM_LOG_WARNING, "could not remove lock file %s", PM_LOCK);
+ alpm_logaction("warning: could not remove lock file %s", PM_LOCK);
hunk ./lib/libalpm/db.c 279
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 289
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 298
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 307
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 312
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 317
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 322
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 328
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 340
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 348
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 354
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 373
+ fp=NULL;
hunk ./lib/libalpm/db.c 382
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 397
+ fp=NULL;
hunk ./lib/libalpm/db.c 406
- return(-1);
+ goto error;
hunk ./lib/libalpm/db.c 454
+
+error:
+ if(fp) {
+ fclose(fp);
+ }
+ return(-1);
hunk ./lib/libalpm/db.c 469
+ int retval = 0;
hunk ./lib/libalpm/db.c 486
- goto error;
+ retval=-1;
+ goto cleanup;
hunk ./lib/libalpm/db.c 520
+ fp=NULL;
hunk ./lib/libalpm/db.c 528
- goto error;
+ retval=-1;
+ goto cleanup;
hunk ./lib/libalpm/db.c 542
+ fp=NULL;
hunk ./lib/libalpm/db.c 550
- goto error;
+ retval=-1;
+ goto cleanup;
hunk ./lib/libalpm/db.c 574
+ fp=NULL;
hunk ./lib/libalpm/db.c 580
+cleanup:
hunk ./lib/libalpm/db.c 583
- return(0);
+ if(fp) {
+ fclose(fp);
+ }
hunk ./lib/libalpm/db.c 587
-error:
- umask(oldmask);
- return(-1);
+ return(retval);
hunk ./lib/libalpm/sync.c 41
+#include "provide.h"
hunk ./lib/libalpm/sync.c 309
- RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+ /* Search provides */
+ PMList *p = _alpm_db_whatprovides(dbs, targ);
+ if(p == NULL) {
+ RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+ }
+ spkg = db_get_pkgfromcache(dbs, p->data);
+ p->data = NULL;
+ FREELIST(p);
hunk ./lib/libalpm/sync.c 326
+ if(spkg == NULL) {
+ /* Search provides */
+ for(j = dbs_sync; j && !spkg; j = j->next) {
+ pmdb_t *dbs = j->data;
+ PMList *p = _alpm_db_whatprovides(dbs, targ);
+ if(p) {
+ spkg = db_get_pkgfromcache(dbs, p->data);
+ p->data = NULL;
+ FREELIST(p);
+ }
+ }
+ }
hunk ./lib/libalpm/sync.c 343
- local = db_get_pkgfromcache(db_local, name);
+ local = db_get_pkgfromcache(db_local, spkg->name);
hunk ./lib/libalpm/util.c 191
- return(unlink(file) == -1);
+ if(unlink(file) == -1 && errno != ENOENT) {
+ return(-1);
+ }
+ return(0);
hunk ./scripts/gensync 114
+ if [ ${#groups[*]} -gt 0 ]; then
+ echo "%GROUPS%" >>desc
+ for it in ${groups[@]}; do
+ echo "$it" >>desc
+ done
+ echo "" >>desc
+ fi
hunk ./scripts/gensync 131
- fi
- if [ ${#groups[*]} -gt 0 ]; then
- echo "%GROUPS%" >>desc
- for it in ${groups[@]}; do
- echo "$it" >>desc
- done
- echo "" >>desc
hunk ./scripts/makepkg 134
+
+ [ $# -gt 0 ] || return
hunk ./src/pacman/add.c 41
+ int retval = 0;
hunk ./src/pacman/add.c 66
+ if(pm_errno == PM_ERR_HANDLE_LOCK) {
+ MSG(NL, " if you're sure a package manager is not already running,\n"
+ " you can remove %s\n", PM_LOCK);
+ }
hunk ./src/pacman/add.c 78
- goto error;
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/add.c 125
- goto error;
+ retval=1;
+ goto cleanup;
hunk ./src/pacman/add.c 133
- goto error;
- }
- if(alpm_trans_release() == -1) {
- ERR(NL, "failed to release transaction (%s)\n", alpm_strerror(pm_errno));
+ retval=1;
+ goto cleanup;
hunk ./src/pacman/add.c 137
- return(0);
-
-error:
+cleanup:
hunk ./src/pacman/add.c 140
+ retval=1;
hunk ./src/pacman/add.c 142
- return(1);
+
+ return(retval);
hunk ./src/pacman/conf.h 36
+ unsigned short noprogressbar;
hunk ./src/pacman/deptest.c 43
+ int retval = 0;
hunk ./src/pacman/deptest.c 62
+ if(pm_errno == PM_ERR_HANDLE_LOCK) {
+ MSG(NL, " if you're sure a package manager is not already running,\n" \
+ " you can remove %s\n", PM_LOCK);
+ }
hunk ./src/pacman/deptest.c 77
- if(alpm_trans_release() == -1) {
- ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
- }
- return(1);
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/deptest.c 90
- if(alpm_trans_release() == -1) {
- ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
- }
- return(1);
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/deptest.c 97
- int ret = 126;
hunk ./src/pacman/deptest.c 98
+ retval = 126;
hunk ./src/pacman/deptest.c 127
- ret = 127;
+ retval = 127;
hunk ./src/pacman/deptest.c 131
- ret = 127;
+ retval = 127;
hunk ./src/pacman/deptest.c 135
- if(alpm_trans_release() == -1) {
- ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
- return(1);
- }
-
hunk ./src/pacman/deptest.c 137
- if(ret == 126 && synctargs != NULL) {
+ if(retval == 126 && synctargs != NULL) {
hunk ./src/pacman/deptest.c 140
- ret = 127;
+ retval = 127;
hunk ./src/pacman/deptest.c 143
+
hunk ./src/pacman/deptest.c 145
- return(ret);
hunk ./src/pacman/deptest.c 147
+cleanup:
hunk ./src/pacman/deptest.c 150
- return(1);
+ retval = 1;
hunk ./src/pacman/deptest.c 153
- return(0);
+ return(retval);
hunk ./src/pacman/download.c 66
+
+ if(config->noprogressbar) {
+ return(1);
+ }
hunk ./src/pacman/pacman.c 305
+ {"noprogressbar", no_argument, 0, 1004},
hunk ./src/pacman/pacman.c 325
+ case 1004: config->noprogressbar = 1; break;
hunk ./src/pacman/pacman.c 495
+ printf(" --noprogressbar do not show a progress bar when downloading files\n");
hunk ./src/pacman/remove.c 44
+ int retval = 0;
hunk ./src/pacman/remove.c 81
- goto error;
+ if(pm_errno == PM_ERR_HANDLE_LOCK) {
+ MSG(NL, " if you're sure a package manager is not already running,\n"
+ " you can remove %s\n", PM_LOCK);
+ }
+ FREELIST(finaltargs);
+ return(1);
hunk ./src/pacman/remove.c 92
- goto error;
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/remove.c 114
- goto error;
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/remove.c 132
- goto error;
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/remove.c 142
- goto error;
- }
-
- /* Step 4: cleanup */
- FREELIST(finaltargs);
- if(alpm_trans_release() == -1) {
- ERR(NL, "failed to release transaction (%s)\n", alpm_strerror(pm_errno));
+ retval = 1;
+ goto cleanup;
hunk ./src/pacman/remove.c 146
- return(0);
-
-error:
+ /* Step 4: release transaction resources
+ */
+cleanup:
hunk ./src/pacman/remove.c 152
+ retval = 1;
hunk ./src/pacman/remove.c 155
- return(1);
+ return(retval);
hunk ./src/pacman/sync.c 421
- retval = 1;
- goto cleanup;
+ if(pm_errno == PM_ERR_HANDLE_LOCK) {
+ MSG(NL, " if you're sure a package manager is not already running,\n"
+ " you can remove %s\n", PM_LOCK);
+ }
+ return(1);
hunk ./src/pacman/sync.c 460
- retval = 1;
- goto cleanup;
+ if(pm_errno == PM_ERR_HANDLE_LOCK) {
+ MSG(NL, " if you're sure a package manager is not already running,\n"
+ " you can remove %s\n", PM_LOCK);
+ }
+ return(1);
hunk ./src/pacman/sync.c 552
- alpm_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? "requires" : "is required by",
+ (int)alpm_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? "requires" : "is required by",
hunk ./src/pacman/sync.c 770
+ /* Step 4: release transaction resources
+ */
hunk ./src/pacman/sync.c 773
- alpm_trans_release();
+ if(alpm_trans_release() == -1) {
+ ERR(NL, "failed to release transaction (%s)\n", alpm_strerror(pm_errno));
+ retval = 1;
+ }
+
}
More information about the Frugalware-darcs
mailing list