summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2011-10-25 10:53:48 +0000
committerJason Woodward2011-10-25 10:53:48 +0000
commit007cf4c103816015b53edbf41c58064e3d4d7b67 (patch)
tree22c52b7a815337096540b8640cecbbb7465bb8e7
parentbe36c7d7f19dd52bf0a513cbcbf9d8192fba2468 (diff)
downloadgslapt-007cf4c103816015b53edbf41c58064e3d4d7b67.tar.gz
fix --install command line handing (thanks George Vlahavas)
-rw-r--r--ChangeLog3
-rw-r--r--src/main.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 973d65c..9d2b808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.5.3g Oct 25, 2011
+ * fix --install command line handing (thanks George Vlahavas)
+
0.5.3f Feb 20, 2011
* gdk-pixbuf2 is now required in current (upcoming 13.2)
diff --git a/src/main.c b/src/main.c
index df00009..17c76b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -212,7 +212,9 @@ int main (int argc, char *argv[]) {
if (p == NULL)
continue;
- if ( inst_p != NULL && slapt_cmp_pkgs(inst_p,p) < 0) {
+ if ( inst_p != NULL && slapt_cmp_pkgs(inst_p,p) == 0) {
+ continue;
+ } else if ( inst_p != NULL && slapt_cmp_pkgs(inst_p,p) < 0) {
if (slapt_add_deps_to_trans(global_config,trans,all,installed,p) == 0) {
slapt_add_upgrade_to_transaction(trans,inst_p,p);
} else {
@@ -220,7 +222,7 @@ int main (int argc, char *argv[]) {
}
} else {
if (slapt_add_deps_to_trans(global_config,trans,all,installed,p) == 0) {
- slapt_pkg_list_t *conflicts;
+ slapt_pkg_list_t *conflicts = slapt_is_conflicted(trans,all,installed,p);
slapt_add_install_to_transaction(trans,p);
if ( conflicts->pkg_count > 0) {
unsigned int cindex = 0;