From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Sep 2011 01:54:52 +0000 (-0700)
Subject: Fix Atom.with_repo() bugs.
X-Git-Tag: v2.2.0_alpha60~41
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5c0f7b06a0b7f6461b3d38ea5a7c261d767fd82b;p=portage.git

Fix Atom.with_repo() bugs.
---

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 5bb6becdb..21e2fac1e 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1217,12 +1217,9 @@ class Atom(_atom_base):
 			allow_repo=True, allow_wildcard=True)
 
 	def with_repo(self, repo):
-		if self.slot is None:
-			atom = self
-		else:
-			atom = remove_slot(self)
+		atom = remove_slot(self)
 		if self.slot is not None:
-			atom += _slot_separator + slot
+			atom += _slot_separator + self.slot
 		atom += _repo_separator + repo
 		if self.use is not None:
 			atom += str(self.use)