Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pacman/Makefile.am2
-rw-r--r--src/pacman/deptest.c155
-rw-r--r--src/pacman/deptest.h28
-rw-r--r--src/pacman/pacman.c108
4 files changed, 185 insertions, 108 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index f8450b86..0a05bd7e 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = -D_GNU_SOURCE \
-I$(top_srcdir)/lib/libftp
pacman_SOURCES = util.c log.c list.c package.c db.c download.c trans.c add.c \
- remove.c upgrade.c query.c sync.c conf.c pacman.c
+ remove.c upgrade.c query.c sync.c conf.c deptest.c pacman.c
pacman_static_SOURCES = $(pacman_SOURCES)
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
new file mode 100644
index 00000000..de7e83ec
--- /dev/null
+++ b/src/pacman/deptest.c
@@ -0,0 +1,155 @@
+/*
+ * deptest.c
+ *
+ * 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.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <alpm.h>
+/* pacman */
+#include "util.h"
+#include "list.h"
+#include "conf.h"
+#include "log.h"
+#include "sync.h"
+#include "deptest.h"
+
+extern config_t *config;
+
+int pacman_deptest(list_t *targets)
+{
+ PM_LIST *data;
+ list_t *i;
+ char *str;
+
+ if(targets == NULL) {
+ return(0);
+ }
+
+ if(config->op_d_vertest) {
+ if(targets->data && targets->next && targets->next->data) {
+ int ret = alpm_pkg_vercmp(targets->data, targets->next->data);
+ printf("%d\n", ret);
+ return(ret);
+ }
+ return(0);
+ }
+
+ /* we create a transaction to hold a dummy package to be able to use
+ * deps checkings from alpm_trans_prepare() */
+ if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL) == -1) {
+ ERR(NL, "%s", alpm_strerror(pm_errno));
+ return(1);
+ }
+
+ /* We use a hidden facility from alpm_trans_addtarget() to add a dummy
+ * target to the transaction (see the library code for details).
+ * It allows us to use alpm_trans_prepare() to check dependencies of the
+ * given target.
+ */
+ str = (char *)malloc(strlen("name=dummy|version=1.0-1")+1);
+ if(str == NULL) {
+ ERR(NL, "memory allocation failure\n");
+ if(alpm_trans_release() == -1) {
+ ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
+ }
+ return(1);
+ }
+ strcpy(str, "name=dummy|version=1.0-1");
+ for(i = targets; i; i = i->next) {
+ str = (char *)realloc(str, strlen(str)+8+strlen(i->data)+1);
+ strcat(str, "|depend=");
+ strcat(str, i->data);
+ }
+ vprint("add target %s\n", str);
+ if(alpm_trans_addtarget(str) == -1) {
+ FREE(str);
+ ERR(NL, "could not add target (%s)\n", alpm_strerror(pm_errno));
+ if(alpm_trans_release() == -1) {
+ ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
+ }
+ return(1);
+ }
+ FREE(str);
+
+ if(alpm_trans_prepare(&data) == -1) {
+ PM_LIST *lp;
+ int ret = 126;
+ list_t *synctargs = NULL;
+
+ switch(pm_errno) {
+ case PM_ERR_UNSATISFIED_DEPS:
+ for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) {
+ PM_DEPMISS *miss = alpm_list_getdata(lp);
+ if(!config->op_d_resolve) {
+ MSG(NL, "requires: %s", alpm_dep_getinfo(miss, PM_DEP_NAME));
+ switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) {
+ case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
+ case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
+ case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
+ }
+ MSG(CL, "\n");
+ }
+ synctargs = list_add(synctargs, strdup(alpm_dep_getinfo(miss, PM_DEP_NAME)));
+ }
+ alpm_list_free(data);
+ break;
+ case PM_ERR_CONFLICTING_DEPS:
+ /* we can't auto-resolve conflicts */
+ for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) {
+ PM_DEPMISS *miss = alpm_list_getdata(lp);
+ MSG(NL, "conflict: %s", alpm_dep_getinfo(miss, PM_DEP_NAME));
+ }
+ ret = 127;
+ alpm_list_free(data);
+ break;
+ default:
+ ret = 127;
+ break;
+ }
+
+ if(alpm_trans_release() == -1) {
+ ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
+ return(1);
+ }
+
+ /* attempt to resolve missing dependencies */
+ /* TODO: handle version comparators (eg, glibc>=2.2.5) */
+ if(ret == 126 && synctargs != NULL) {
+ if(!config->op_d_resolve || pacman_sync(synctargs) != 0) {
+ /* error (or -D not used) */
+ ret = 127;
+ }
+ }
+ FREELIST(synctargs);
+ return(ret);
+ }
+
+ if(alpm_trans_release() == -1) {
+ ERR(NL, "could not release transaction (%s)", alpm_strerror(pm_errno));
+ return(1);
+ }
+
+ return(0);
+}
+
+/* vim: set ts=2 sw=2 noet: */
diff --git a/src/pacman/deptest.h b/src/pacman/deptest.h
new file mode 100644
index 00000000..5b2ff751
--- /dev/null
+++ b/src/pacman/deptest.h
@@ -0,0 +1,28 @@
+/*
+ * deptest.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 _PM_DEPTEST_H
+#define _PM_DEPTEST_H
+
+int pacman_deptest(list_t *targets);
+
+#endif /* _PM_DEPTEST_H */
+
+/* vim: set ts=2 sw=2 noet: */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 3543afea..0a685907 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -46,6 +46,7 @@
#include "upgrade.h"
#include "query.h"
#include "sync.h"
+#include "deptest.h"
#include "pacman.h"
config_t *config = NULL;
@@ -244,113 +245,6 @@ void cleanup(int signum)
exit(signum);
}
-int pacman_deptest(list_t *targets)
-{
- PM_LIST *data;
- list_t *i;
- char *str;
-
- if(targets == NULL) {
- return(0);
- }
-
- if(config->op_d_vertest) {
- if(targets->data && targets->next && targets->next->data) {
- int ret = alpm_pkg_vercmp(targets->data, targets->next->data);
- printf("%d\n", ret);
- return(ret);
- }
- return(0);
- }
-
- /* we create a transaction to hold a dummy package to be able to use
- * deps checkings from alpm_trans_prepare() */
- if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL) == -1) {
- ERR(NL, "%s", alpm_strerror(pm_errno));
- return(1);
- }
-
- /* We use a hidden facility from alpm_trans_addtarget() to add a dummy
- * target to the transaction (see the library code for details).
- * It allows us to use alpm_trans_prepare() to check dependencies of the
- * given target.
- */
- str = (char *)malloc(strlen("name=dummy|version=1.0-1")+1);
- strcpy(str, "name=dummy|version=1.0-1");
- for(i = targets; i; i = i->next) {
- str = (char *)realloc(str, strlen(str)+8+strlen(i->data)+1);
- strcat(str, "|depend=");
- strcat(str, i->data);
- }
- if(alpm_trans_addtarget(str) == -1) {
- FREE(str);
- ERR(NL, "%s\n", alpm_strerror(pm_errno));
- alpm_trans_release();
- return(1);
- }
- FREE(str);
-
- if(alpm_trans_prepare(&data) == -1) {
- PM_LIST *lp;
- int ret = 126;
- list_t *synctargs = NULL;
-
- switch(pm_errno) {
- case PM_ERR_UNSATISFIED_DEPS:
- for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) {
- PM_DEPMISS *miss = alpm_list_getdata(lp);
- if(!config->op_d_resolve) {
- MSG(NL, "requires: %s", alpm_dep_getinfo(miss, PM_DEP_NAME));
- switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) {
- case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
- case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
- case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
- }
- MSG(CL, "\n");
- }
- synctargs = list_add(synctargs, strdup(alpm_dep_getinfo(miss, PM_DEP_NAME)));
- }
- alpm_list_free(data);
- break;
- case PM_ERR_CONFLICTING_DEPS:
- /* we can't auto-resolve conflicts */
- for(lp = alpm_list_first(data); lp; lp = alpm_list_next(lp)) {
- PM_DEPMISS *miss = alpm_list_getdata(lp);
- MSG(NL, "conflict: %s", alpm_dep_getinfo(miss, PM_DEP_NAME));
- }
- ret = 127;
- alpm_list_free(data);
- break;
- default:
- ret = 127;
- break;
- }
-
- if(alpm_trans_release() == -1) {
- ERR(NL, "%s", alpm_strerror(pm_errno));
- return(1);
- }
-
- /* attempt to resolve missing dependencies */
- /* TODO: handle version comparators (eg, glibc>=2.2.5) */
- if(ret == 126 && synctargs != NULL) {
- if(!config->op_d_resolve || pacman_sync(synctargs) != 0) {
- /* error (or -D not used) */
- ret = 127;
- }
- }
- FREELIST(synctargs);
- return(ret);
- }
-
- if(alpm_trans_release() == -1) {
- ERR(NL, "%s", alpm_strerror(pm_errno));
- return(1);
- }
-
- return(0);
-}
-
/* Parse command-line arguments for each operation
* argc: argc
* argv: argv