[gentoo-commits] proj/portage:prefix commit in: pym/portage/repository/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/repository/

[Fabian Groffen]

commit:     cd47ea5d9038c613bcb58bb067b159353b1a89bb
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 14:08:33 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:33:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cd47ea5d

RepoConfig: fix bug #485006

---
 pym/portage/repository/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index b5289d9..bb63b1a 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -182,7 +182,8 @@ class RepoConfig(object):
 				# The name from repos.conf has to be used here for
 				# things like emerge-webrsync to work when the repo
 				# is empty (bug #484950).
-				self.name = name
+				if name is not None:
+					self.name = name
 				if portage._sync_disabled_warnings:
 					missing = False
 

[gentoo-commits] proj/portage:prefix commit in: pym/portage/repository/

[Fabian Groffen]

commit:     94b16bff609d9fd3cc9e2d2e766a3970ce00fd68
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 10:57:55 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:33:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=94b16bff

emerge-webrsync: fix bug #484950

---
 pym/portage/repository/config.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 6ab3065..b5289d9 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -178,9 +178,14 @@ class RepoConfig(object):
 		if self.location is not None:
 			eapi = read_corresponding_eapi_file(os.path.join(self.location, REPO_NAME_LOC))
 			self.name, missing = self._read_valid_repo_name(self.location)
-			if missing and portage._sync_disabled_warnings:
+			if missing:
+				# The name from repos.conf has to be used here for
+				# things like emerge-webrsync to work when the repo
+				# is empty (bug #484950).
 				self.name = name
-				missing = False
+				if portage._sync_disabled_warnings:
+					missing = False
+
 		elif name == "DEFAULT":
 			missing = False