[gentoo-commits] proj/portage:multilib commit in: pym/repoman/

[gentoo-commits] proj/portage:multilib commit in: pym/repoman/

[Thomas Sachau]

commit:     71f98544eb0436c065dabbe5cfd8cecaa972f2e4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 21:21:03 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 21:21:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=71f98544

NoOffsetWithHelpers: fix invalid errors name

---
 pym/repoman/checks.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index d00e6d5..7e5a8a1 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -334,7 +334,7 @@ class NoOffsetWithHelpers(LineCheck):
 
 	repoman_check_name = 'variable.usedwithhelpers'
 	re = re.compile(r'.*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\}?.*')
-	error = errors.EPREFIX_WITH_HELPERS
+	error = errors.NO_OFFSET_WITH_HELPERS
 
 class ImplicitRuntimeDeps(LineCheck):
 	"""

[gentoo-commits] proj/portage:multilib commit in: pym/repoman/

[Thomas Sachau]

commit:     52f6b55d51e2accaa446bc5d6920421959289baa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  3 20:49:31 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 05:02:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=52f6b55d

parse_metadata_use(): omit empty text tokens.

---
 pym/repoman/utilities.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 9d4898e..ceb1ba1 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -157,7 +157,8 @@ def parse_metadata_use(xml_tree):
 				uselist[pkg_flag] = {}
 
 			# (flag_restrict can be None)
-			uselist[pkg_flag][flag_restrict] = " ".join("".join(inner_text).split())
+			uselist[pkg_flag][flag_restrict] = " ".join( \
+					[x for x in "".join(inner_text).split() if x])
 
 	return uselist
 

[gentoo-commits] proj/portage:multilib commit in: pym/repoman/

[Thomas Sachau]

commit:     c202f11dc844edc8dea4ececc6ac8590af903cf0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 00:56:14 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 00:56:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c202f11d

Revert "parse_metadata_use(): omit empty text tokens."

This reverts commit 52f6b55d51e2accaa446bc5d6920421959289baa.

Since split() never return empty tokens, this patch does nothing.

---
 pym/repoman/utilities.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index ceb1ba1..9d4898e 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -157,8 +157,7 @@ def parse_metadata_use(xml_tree):
 				uselist[pkg_flag] = {}
 
 			# (flag_restrict can be None)
-			uselist[pkg_flag][flag_restrict] = " ".join( \
-					[x for x in "".join(inner_text).split() if x])
+			uselist[pkg_flag][flag_restrict] = " ".join("".join(inner_text).split())
 
 	return uselist