From: Marius Mauch <genone@gentoo.org>
Date: Fri, 2 May 2008 03:23:38 +0000 (-0000)
Subject: remove 'sets/' name-prefix for file-based package sets
X-Git-Tag: v2.2_pre6~62
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=908e8bf9c693a7d0b6b9dc7a7c463e26bffb7b18;p=portage.git

remove 'sets/' name-prefix for file-based package sets

svn path=/main/trunk/; revision=10073
---

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 3fe397c5c..bf9f9e6e8 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -108,7 +108,7 @@ class StaticFileSet(EditablePackageSet):
 	def multiBuilder(self, options, settings, trees):
 		rValue = {}
 		directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(os.sep), "sets"))
-		name_pattern = options.get("name_pattern", "sets/${name}")
+		name_pattern = options.get("name_pattern", "${name}")
 		if not "$name" in name_pattern and not "${name}" in name_pattern:
 			raise SetConfigError("name_pattern doesn't include ${name} placeholder")
 		greedy = get_boolean(options, "greedy", False)