mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
2aa7e69da9
pmdepmissing_t was used for two totally different things : missing dependencies, and dependency conflicts. So this patch simply adds a type for dep conflicts, and convert the code to use it. This fix the TODO in conflict.c : /* TODO WTF is a 'depmissing' doing indicating a conflict? */ Additionally, the code in conflict.c now eliminates the duplicated conflicts. If pkg1 conflicts with pkg2, and pkg2 conflicts with pkg1, only one of them will be stored. However the conflict handling in sync_prepare (sync.c) is still very asymetrical, and very ugly too. This should be improved in the future (there is already a pending patch from Nagy that cleans it a lot). Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
50 lines
1.5 KiB
C
50 lines
1.5 KiB
C
/*
|
|
* conflict.h
|
|
*
|
|
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
* USA.
|
|
*/
|
|
#ifndef _ALPM_CONFLICT_H
|
|
#define _ALPM_CONFLICT_H
|
|
|
|
#include "alpm.h"
|
|
#include "db.h"
|
|
#include "package.h"
|
|
|
|
#define CONFLICT_FILE_LEN 512
|
|
|
|
struct __pmconflict_t {
|
|
char package1[PKG_NAME_LEN];
|
|
char package2[PKG_NAME_LEN];
|
|
};
|
|
|
|
struct __pmfileconflict_t {
|
|
char target[PKG_NAME_LEN];
|
|
pmfileconflicttype_t type;
|
|
char file[CONFLICT_FILE_LEN];
|
|
char ctarget[PKG_NAME_LEN];
|
|
};
|
|
|
|
pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2);
|
|
int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack);
|
|
alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages);
|
|
alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root);
|
|
|
|
#endif /* _ALPM_CONFLICT_H */
|
|
|
|
/* vim: set ts=2 sw=2 noet: */
|