public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/
@ 2014-07-18 16:20 André Erdmann
  2014-07-17 20:12 ` [gentoo-commits] proj/R_overlay:wip/addition_control " André Erdmann
  0 siblings, 1 reply; 4+ messages in thread
From: André Erdmann @ 2014-07-18 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     093b182951ad7ab6eb7e519061c7b95dc218aacb
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 17 19:14:21 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 17 19:14:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=093b1829

overlay/abccontrol: convert_str()

---
 roverlay/overlay/abccontrol.py | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/roverlay/overlay/abccontrol.py b/roverlay/overlay/abccontrol.py
index 364a083..d031eec 100644
--- a/roverlay/overlay/abccontrol.py
+++ b/roverlay/overlay/abccontrol.py
@@ -82,17 +82,37 @@ class AdditionControlResult ( object ):
    ) = _gen_bits(5)
 
 
-#   PKG_DESCRIPTION_MAP      = {
-#      PKG_FORCE_DENY           : 'force-deny',
-#      PKG_DENY_REPLACE         : 'deny-replace',
-#      PKG_FORCE_REPLACE        : 'force-replace',
-#      PKG_REPLACE_ONLY         : 'replace-only',
-#      PKG_REVBUMP_ON_COLLISION : 'revbump-on-collision',
-#      PKG_DEFAULT_BEHAVIOR     : 'default',
-#   }
-#
-#   PKG_DESCRIPTION_REVMAP   = { v: k for k,v in PKG_DESCRIPTION_MAP.items() }
-#
+   PKG_DESCRIPTION_MAP      = {
+      PKG_FORCE_DENY           : 'force-deny',
+      PKG_DENY_REPLACE         : 'deny-replace',
+      PKG_FORCE_REPLACE        : 'force-replace',
+      PKG_REPLACE_ONLY         : 'replace-only',
+      PKG_REVBUMP_ON_COLLISION : 'revbump-on-collision',
+      PKG_DEFAULT_BEHAVIOR     : 'default',
+   }
+
+   PKG_DESCRIPTION_REVMAP   = { v: k for k,v in PKG_DESCRIPTION_MAP.items() }
+
+   @classmethod
+   def convert_str ( cls, s ):
+      desc_rmap = cls.PKG_DESCRIPTION_REVMAP
+
+      if not s:
+         raise ValueError ( "str must not be empty." )
+
+      bitmask = 0
+
+      for arg in filter ( None, s.strip().lower().split(",") ):
+         # ^ strip(),lower(),split() ...
+         print(arg)
+         try:
+            bitmask |= desc_rmap [arg]
+         except KeyError:
+            raise ValueError ( arg )
+      # -- end for
+
+      return bitmask
+   # --- end of convert_str (...) ---
 
    @classmethod
    def get_reversed_sort_key ( cls, k ):


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/R_overlay:wip/addition_control commit in: roverlay/overlay/
@ 2014-07-18  2:28 André Erdmann
  0 siblings, 0 replies; 4+ messages in thread
From: André Erdmann @ 2014-07-18  2:28 UTC (permalink / raw
  To: gentoo-commits

commit:     9c4859591aa5d5388c192f932f3e4d8a1344e57d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 18 02:23:31 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 18 02:23:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9c485959

roverlay/overlay/abccontrol: comment

---
 roverlay/overlay/abccontrol.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/roverlay/overlay/abccontrol.py b/roverlay/overlay/abccontrol.py
index a319e35..991343e 100644
--- a/roverlay/overlay/abccontrol.py
+++ b/roverlay/overlay/abccontrol.py
@@ -81,6 +81,10 @@ class AdditionControlResult ( object ):
       PKG_ALL,
    ) = _gen_bits(5)
 
+##   # virtuals
+##   PKG_REVBUMP_ONLY       = PKG_REVBUMP_ON_COLLISION|PKG_REPLACE_ONLY
+##   PKG_FORCE_REPLACE_ONLY = PKG_FORCE_REPLACE|PKG_REPLACE_ONLY
+
 
    PKG_DESCRIPTION_MAP      = {
       PKG_FORCE_DENY           : 'force-deny',
@@ -89,6 +93,10 @@ class AdditionControlResult ( object ):
       PKG_REPLACE_ONLY         : 'replace-only',
       PKG_REVBUMP_ON_COLLISION : 'revbump-on-collision',
       PKG_DEFAULT_BEHAVIOR     : 'default',
+
+##      # virtuals
+##      PKG_REVBUMP_ONLY         : 'revbump-on-collision,replace-only',
+##      PKG_FORCE_REPLACE_ONLY   : 'force-replace,replace-only',
    }
 
    PKG_DESCRIPTION_REVMAP   = { v: k for k,v in PKG_DESCRIPTION_MAP.items() }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/R_overlay:wip/addition_control commit in: roverlay/overlay/
@ 2014-07-18  2:28 André Erdmann
  0 siblings, 0 replies; 4+ messages in thread
From: André Erdmann @ 2014-07-18  2:28 UTC (permalink / raw
  To: gentoo-commits

commit:     13ae9d788d175488eaa5b4ba2637ed04fb6423bb
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 18 01:00:42 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 18 01:00:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=13ae9d78

roverlay/overlay/abccontrol: remove dbg statement

---
 roverlay/overlay/abccontrol.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roverlay/overlay/abccontrol.py b/roverlay/overlay/abccontrol.py
index d031eec..a319e35 100644
--- a/roverlay/overlay/abccontrol.py
+++ b/roverlay/overlay/abccontrol.py
@@ -104,7 +104,6 @@ class AdditionControlResult ( object ):
 
       for arg in filter ( None, s.strip().lower().split(",") ):
          # ^ strip(),lower(),split() ...
-         print(arg)
          try:
             bitmask |= desc_rmap [arg]
          except KeyError:


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-18 16:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-18 16:20 [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/ André Erdmann
2014-07-17 20:12 ` [gentoo-commits] proj/R_overlay:wip/addition_control " André Erdmann
  -- strict thread matches above, loose matches on Subject: below --
2014-07-18  2:28 André Erdmann
2014-07-18  2:28 André Erdmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox