bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make struct pmconflict_t public

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-16 11:33:20 -05:00
parent bdf00d3dbd
commit 19fcc74016
6 changed files with 21 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/alpm.h
View file

@ -92,7 +92,13 @@ typedef struct __pmgrp_t pmgrp_t;
typedef struct __pmtrans_t pmtrans_t; typedef struct __pmtrans_t pmtrans_t;
typedef struct __pmdepend_t pmdepend_t; typedef struct __pmdepend_t pmdepend_t;
typedef struct __pmdepmissing_t pmdepmissing_t; typedef struct __pmdepmissing_t pmdepmissing_t;
typedef struct __pmconflict_t pmconflict_t;
/** Conflict */
typedef struct _pmconflict_t {
char *package1;
char *package2;
char *reason;
} pmconflict_t;
/** File conflict */ /** File conflict */
typedef struct _pmfileconflict_t { typedef struct _pmfileconflict_t {
@ -928,10 +934,6 @@ const char *alpm_miss_get_causingpkg(const pmdepmissing_t *miss);
alpm_list_t *alpm_checkconflicts(pmhandle_t *handle, alpm_list_t *pkglist); alpm_list_t *alpm_checkconflicts(pmhandle_t *handle, alpm_list_t *pkglist);
const char *alpm_conflict_get_package1(pmconflict_t *conflict);
const char *alpm_conflict_get_package2(pmconflict_t *conflict);
const char *alpm_conflict_get_reason(pmconflict_t *conflict);
/** Returns the type of version constraint. /** Returns the type of version constraint.
* @param dep a dependency info structure * @param dep a dependency info structure
* @return the type of version constraint (PM_DEP_MOD_ANY if no version * @return the type of version constraint (PM_DEP_MOD_ANY if no version

18
lib/libalpm/conflict.c
View file

@ -547,22 +547,4 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle,
return conflicts; return conflicts;
} }
const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict)
{
ASSERT(conflict != NULL, return NULL);
return conflict->package1;
}
const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
{
ASSERT(conflict != NULL, return NULL);
return conflict->package2;
}
const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
{
ASSERT(conflict != NULL, return NULL);
return conflict->reason;
}
/* vim: set ts=2 sw=2 noet: */ /* vim: set ts=2 sw=2 noet: */

6
lib/libalpm/conflict.h
View file

@ -24,12 +24,6 @@
#include "db.h" #include "db.h"
#include "package.h" #include "package.h"
struct __pmconflict_t {
char *package1;
char *package2;
char *reason;
};
pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict); pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
void _alpm_conflict_free(pmconflict_t *conflict); void _alpm_conflict_free(pmconflict_t *conflict);
alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages); alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages);

12
src/pacman/sync.c
View file

@ -795,14 +795,14 @@ static int sync_trans(alpm_list_t *targets)
case PM_ERR_CONFLICTING_DEPS: case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
pmconflict_t *conflict = alpm_list_getdata(i); pmconflict_t *conflict = alpm_list_getdata(i);
const char *package1 = alpm_conflict_get_package1(conflict);
const char *package2 = alpm_conflict_get_package2(conflict);
const char *reason = alpm_conflict_get_reason(conflict);
/* only print reason if it contains new information */ /* only print reason if it contains new information */
if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) { if(strcmp(conflict->package1, conflict->reason) == 0 ||
printf(_(":: %s and %s are in conflict\n"), package1, package2); strcmp(conflict->package2, conflict->reason) == 0) {
printf(_(":: %s and %s are in conflict\n"),
conflict->package1, conflict->package2);
} else { } else {
printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); printf(_(":: %s and %s are in conflict (%s)\n"),
conflict->package1, conflict->package2, conflict->reason);
} }
} }
break; break;

13
src/pacman/upgrade.c
View file

@ -121,14 +121,13 @@ int pacman_upgrade(alpm_list_t *targets)
case PM_ERR_CONFLICTING_DEPS: case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
pmconflict_t *conflict = alpm_list_getdata(i); pmconflict_t *conflict = alpm_list_getdata(i);
const char *package1 = alpm_conflict_get_package1(conflict); if(strcmp(conflict->package1, conflict->reason) == 0 ||
const char *package2 = alpm_conflict_get_package2(conflict); strcmp(conflict->package2, conflict->reason) == 0) {
const char *reason = alpm_conflict_get_reason(conflict); printf(_(":: %s and %s are in conflict\n"),
/* only print reason if it contains new information */ conflict->package1, conflict->package2);
if(strcmp(package1, reason) == 0 || strcmp(package2, reason) == 0) {
printf(_(":: %s and %s are in conflict\n"), package1, package2);
} else { } else {
printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); printf(_(":: %s and %s are in conflict (%s)\n"),
conflict->package1, conflict->package2, conflict->reason);
} }
} }
break; break;

4
src/util/testdb.c
View file

@ -120,8 +120,8 @@ static int checkconflicts(alpm_list_t *pkglist)
data = alpm_checkconflicts(handle, pkglist); data = alpm_checkconflicts(handle, pkglist);
for(i = data; i; i = i->next) { for(i = data; i; i = i->next) {
pmconflict_t *conflict = alpm_list_getdata(i); pmconflict_t *conflict = alpm_list_getdata(i);
printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict), printf("%s conflicts with %s\n",
alpm_conflict_get_package2(conflict)); conflict->package1, conflict->package2);
ret++; ret++;
} }
FREELIST(data); FREELIST(data);