| 1 |
commit: cc03c1b78e2f92191748d3f7d3b5a02df119a33a |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed Aug 28 09:34:40 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed Aug 28 09:34:40 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=cc03c1b7 |
| 7 |
|
| 8 |
package rule parser, depstr_ignore: minor changes |
| 9 |
|
| 10 |
* don't unquote the dependency string |
| 11 |
* store data in depconf->depstr_ignore, not depconf->depres_ignore |
| 12 |
|
| 13 |
--- |
| 14 |
roverlay/packagerules/actions/dependencies.py | 2 +- |
| 15 |
roverlay/packagerules/parser/context/action.py | 5 ++--- |
| 16 |
2 files changed, 3 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/roverlay/packagerules/actions/dependencies.py b/roverlay/packagerules/actions/dependencies.py |
| 19 |
index db4671d..f6233a2 100644 |
| 20 |
--- a/roverlay/packagerules/actions/dependencies.py |
| 21 |
+++ b/roverlay/packagerules/actions/dependencies.py |
| 22 |
@@ -163,7 +163,7 @@ class DependencyInjectAction ( DependencyVarAction ): |
| 23 |
# --- end of DependencyInjectAction (...) --- |
| 24 |
|
| 25 |
class DepStrIgnoreAction ( DependencyVarAction ): |
| 26 |
- CATEGORY_KEY = 'depres_ignore' |
| 27 |
+ CATEGORY_KEY = 'depstr_ignore' |
| 28 |
ACTION_KEYWORD = CATEGORY_KEY |
| 29 |
CONVERT_VALUE_TO_DEPRESULT = False |
| 30 |
# --- end of DepStrIgnoreAction --- |
| 31 |
|
| 32 |
diff --git a/roverlay/packagerules/parser/context/action.py b/roverlay/packagerules/parser/context/action.py |
| 33 |
index 284d62e..c860d81 100644 |
| 34 |
--- a/roverlay/packagerules/parser/context/action.py |
| 35 |
+++ b/roverlay/packagerules/parser/context/action.py |
| 36 |
@@ -301,11 +301,10 @@ class RuleActionContext ( |
| 37 |
depstr_cls = self.KEYWORDS_DEPSTR [keyword] |
| 38 |
|
| 39 |
if depstr_cls: |
| 40 |
+ # don't unquote argstr |
| 41 |
self._add_action ( |
| 42 |
depstr_cls.from_namespace ( |
| 43 |
- self.namespace, 'all', |
| 44 |
- roverlay.strutil.unquote ( argstr ), |
| 45 |
- lino |
| 46 |
+ self.namespace, 'all', argstr, lino |
| 47 |
) |
| 48 |
) |
| 49 |
return True |
Archives