diff options
| author |   André Erdmann <dywi@mailerd.de> | 2013-08-28 11:34:40 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2013-08-28 11:34:40 +0200 |
| commit | cc03c1b78e2f92191748d3f7d3b5a02df119a33a (patch) | |
| tree | 124558c4140bacd2952a84f3981d0a57a084aa3a /roverlay/packagerules | |
| parent | package rule parser: depstr_ignore (diff) | |
| download | R_overlay-cc03c1b78e2f92191748d3f7d3b5a02df119a33a.tar.gz R_overlay-cc03c1b78e2f92191748d3f7d3b5a02df119a33a.tar.bz2 R_overlay-cc03c1b78e2f92191748d3f7d3b5a02df119a33a.zip | |
package rule parser, depstr_ignore: minor changes
* don't unquote the dependency string
* store data in depconf->depstr_ignore, not depconf->depres_ignore
Diffstat (limited to 'roverlay/packagerules')
| -rw-r--r-- | roverlay/packagerules/actions/dependencies.py | 2 | ||||
| -rw-r--r-- | roverlay/packagerules/parser/context/action.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/roverlay/packagerules/actions/dependencies.py b/roverlay/packagerules/actions/dependencies.py index db4671d..f6233a2 100644 --- a/roverlay/packagerules/actions/dependencies.py +++ b/roverlay/packagerules/actions/dependencies.py @@ -163,7 +163,7 @@ class DependencyInjectAction ( DependencyVarAction ): # --- end of DependencyInjectAction (...) --- class DepStrIgnoreAction ( DependencyVarAction ): - CATEGORY_KEY = 'depres_ignore' + CATEGORY_KEY = 'depstr_ignore' ACTION_KEYWORD = CATEGORY_KEY CONVERT_VALUE_TO_DEPRESULT = False # --- end of DepStrIgnoreAction --- diff --git a/roverlay/packagerules/parser/context/action.py b/roverlay/packagerules/parser/context/action.py index 284d62e..c860d81 100644 --- a/roverlay/packagerules/parser/context/action.py +++ b/roverlay/packagerules/parser/context/action.py @@ -301,11 +301,10 @@ class RuleActionContext ( depstr_cls = self.KEYWORDS_DEPSTR [keyword] if depstr_cls: + # don't unquote argstr self._add_action ( depstr_cls.from_namespace ( - self.namespace, 'all', - roverlay.strutil.unquote ( argstr ), - lino + self.namespace, 'all', argstr, lino ) ) return True |