From: Stephan Kulow <coolo@suse.de>
Date: Fri, 12 Oct 2007 11:45:43 +0000 (+0000)
Subject: fixing some bugs:
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~938
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa5171f4ec8b6fb0a56bb1c604289fcdd9845ab3;p=thirdparty%2Flibsolv.git

fixing some bugs:
  - remove the original package on upgrade, not the new
    one
  - always set i686 when no arch is set (as required)
  - handle "install" as capability not as name
  - handle different kind of solvables in install
  - install locale solvables into an extra channel
---

diff --git a/src/solver.c b/src/solver.c
index ac7359ba..2ca6498f 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -2281,9 +2281,9 @@ printdecisions(Solver *solv)
 	      if (fn || f->name != s->name)
 		{
 		  if (solv->rc_output == 2)
-		    printf(">!> remove  %s-%s%s\n", id2str(pool, s->name), id2rc(solv, s->evr), id2str(pool, s->evr));
+		    printf(">!> remove  %s-%s%s\n", id2str(pool, f->name), id2rc(solv, f->evr), id2str(pool, f->evr));
 		  else if (solv->rc_output)
-		    printf(">!> remove  %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch));
+		    printf(">!> remove  %s-%s.%s\n", id2str(pool, f->name), id2str(pool, f->evr), id2str(pool, f->arch));
 		  uninstalls++;
 		}
 	      else
@@ -2308,7 +2308,7 @@ printdecisions(Solver *solv)
       if (solv->rc_output)
 	{
 	  Source *source = pool_source(pool, s);
-	  if (source)
+	  if (source && strcmp(source_name(source), "locales"))
 	    printf("[%s]", source_name(source));
         }
       printf("\n");