public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/
@ 2013-06-30 15:58 André Erdmann
  2013-06-26 17:29 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  0 siblings, 1 reply; 10+ messages in thread
From: André Erdmann @ 2013-06-30 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     84f3fafe99ee9e291ef09cd4b9ea0c8ec933a45b
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 26 17:22:27 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 26 17:22:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=84f3fafe

roverlay/config/tree, visualize(): sort entries

---
 roverlay/config/tree.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/roverlay/config/tree.py b/roverlay/config/tree.py
index 3466889..4be20c1 100644
--- a/roverlay/config/tree.py
+++ b/roverlay/config/tree.py
@@ -252,12 +252,15 @@ class ConfigTree ( object ):
             return "{}{} is empty\n".format ( var_indent, name )
          else:
             extra = ''.join ( [
-               self._tree_to_str ( n, r, level+1 ) for r, n in root.items()
+               self._tree_to_str ( n, r, level+1 ) for r, n in sorted (
+                  root.items(),
+                  key=lambda e: ( isinstance ( e[1], dict ), e[0] )
+               )
             ] )
-            return "{i}{} {{\n{}{i}}}\n".format ( name, extra, i=indent )
-      elif level == 1:
-         # non-nested config entry
-         return "\n{}{} = {!r}\n\n".format ( var_indent, name, root )
+            return "{i}{n} {{\n{e}{i}}}\n".format ( n=name, e=extra, i=indent )
+#      elif level == 1:
+#         # non-nested config entry
+#         return "\n{}{} = {!r}\n".format ( var_indent, name, root )
       else:
          return "{}{} = {!r}\n".format ( var_indent, name, root )
    # --- end of _tree_to_str (...) ---


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/
@ 2013-07-16 16:36 André Erdmann
  2013-07-15 22:31 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  0 siblings, 1 reply; 10+ messages in thread
From: André Erdmann @ 2013-07-16 16:36 UTC (permalink / raw
  To: gentoo-commits

commit:     39d0fc71190b45813be08386c638bb49e1827454
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 15 22:28:30 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 15 22:28:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=39d0fc71

roverlay/config/defconfig: set EVENT_HOOK_RESTRICT

---
 roverlay/config/defconfig.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/roverlay/config/defconfig.py b/roverlay/config/defconfig.py
index 7ae0d5b..9e0f336 100644
--- a/roverlay/config/defconfig.py
+++ b/roverlay/config/defconfig.py
@@ -69,16 +69,22 @@ class ConfigOption ( object ):
       self.append_newline   = append_newline
       self.value            = None
       self.defaults_to      = defaults_to
+
+      #self.is_set = False
    # --- end of __init__ (...) ---
 
+   def set_value ( self, value ):
+      self.value  = value
+      #self.is_set = True
+
    def gen_str ( self ):
       entry = self.map_entry[1]
 
       if self.value is None:
          using_default = True
          self.value = self.default
-      elif self.value == self.default:
-         using_default = True
+#      elif self.value == self.default:
+#         using_default = True
       else:
          using_default = False
 
@@ -198,8 +204,8 @@ class RoverlayConfigCreation ( object ):
          except ( TypeError, ValueError ):
             raise ConfigValueError ( key, value )
 
-         if converted_value:
-            option.value = svalue
+         if converted_value is not None:
+            option.set_value ( svalue )
          else:
             raise ConfigValueError ( key, value )
          pass
@@ -279,8 +285,12 @@ class RoverlayConfigCreation ( object ):
             'EVENT_HOOK', datadir ( 'hooks/mux.sh' ),
          ),
          ConfigOption (
-            'EVENT_HOOK_RESTRICT', '-* overlay_success',
-            comment_default=True, required=False,
+            'EVENT_HOOK_RESTRICT', '-* overlay_success user',
+            description=(
+               'Note:',
+               ' setting -user is highly recommended when running roverlay as root',
+            ),
+            comment_default=False, required=False,
             defaults_to=( "*", "allow all" ),
          ),
          ConfigOption (


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/
@ 2013-07-12 13:57 André Erdmann
  2013-07-12 13:57 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  0 siblings, 1 reply; 10+ messages in thread
From: André Erdmann @ 2013-07-12 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     5ba978bbb4230068c6f43626f235a342b7c4cd05
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 13:46:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 13:46:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5ba978bb

config: fix want_dir_create for distfiles_root

---
 roverlay/config/entrymap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 86c17da..e87a289 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -401,7 +401,7 @@ CONFIG_ENTRY_MAP = dict (
          'this is the directory where per-repo package directories '
          'will be created'
       ),
-      want_dir_create = WANT_PRIVATE_FILEDIR | WANT_USERDIR,
+      want_dir_create = WANT_PRIVATE_DIR | WANT_USERDIR,
    ),
 
    # the repo config file(s)


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/config/
@ 2013-07-12 13:57 André Erdmann
  0 siblings, 0 replies; 10+ messages in thread
From: André Erdmann @ 2013-07-12 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     50aa4030f1150b7408added17ad3c076b9bcfe3f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 13:43:42 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 13:43:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=50aa4030

roverlay/config/defconfig: set DISTDIR=/.../mirror

Avoid distdir/distfiles confusion by setting DISTDIR to mirror.

---
 roverlay/config/defconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roverlay/config/defconfig.py b/roverlay/config/defconfig.py
index 733a108..7ae0d5b 100644
--- a/roverlay/config/defconfig.py
+++ b/roverlay/config/defconfig.py
@@ -221,7 +221,7 @@ class RoverlayConfigCreation ( object ):
          '',
          ConfigOption ( 'DISTFILES',   workdir ( 'distfiles' ) ),
          ConfigOption ( 'OVERLAY_DIR', workdir ( 'overlay' ) ),
-         ConfigOption ( 'DISTDIR',     workdir ( 'distdir' ) ),
+         ConfigOption ( 'DISTDIR',     workdir ( 'mirror' ) ),
          ConfigOption (
             'LOG_FILE', workdir ( 'log/roverlay.log' ), recommended=True,
             use_default_desc=False


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/
@ 2013-07-11 16:29 André Erdmann
  2013-07-11 16:44 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  0 siblings, 1 reply; 10+ messages in thread
From: André Erdmann @ 2013-07-11 16:29 UTC (permalink / raw
  To: gentoo-commits

commit:     384456170719b57f0dbdcefa5344eb74213bd09a
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 16:26:11 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 16:26:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=38445617

roverlay/config: update description

---
 roverlay/config/entrymap.py  | 27 +++++++++++++-------------
 roverlay/config/entryutil.py | 45 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 35f1e66..de29ca7 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -224,9 +224,9 @@ CONFIG_ENTRY_MAP = dict (
    ),
    overlay_dir = dict (
       value_type = 'fs_abs:fs_dir',
-      description = '''overlay root directory where the
-         ebuilds, profiles/ dir, etc. will be written to.
-      '''
+      description = (
+         'this is the directory of the overlay to be created/maintained'
+      ),
    ),
 
    overlay_additions_dir = dict (
@@ -274,11 +274,11 @@ CONFIG_ENTRY_MAP = dict (
 
    overlay_distdir_root = dict (
       value_type  = 'fs_dir',
-      description = '''
-         DISTDIR which is used for Manifest creation and can,
-         depending on the DISTDIR strategy,
-         serve as package mirror directory.
-      '''
+      description = (
+         'this is the directory where hard/symbolic links '
+         'to all package files will be created '
+         '(during Manifest file creation)'
+      ),
    ),
 
    overlay_distdir_strategy = dict (
@@ -376,9 +376,10 @@ CONFIG_ENTRY_MAP = dict (
    #  they specify another location
    distfiles_root = dict (
       value_type  = 'fs_dir',
-      description = '''distfiles root,
-         repos will create their distdirs in this directory.
-      ''',
+      description = (
+         'this is the directory where per-repo package directories '
+         'will be created'
+      ),
    ),
 
    # the repo config file(s)
@@ -447,7 +448,7 @@ CONFIG_ENTRY_MAP = dict (
    package_rule_files = dict (
       path        = [ 'PACKAGE_RULES', 'files' ],
       value_type  = fs_abslist,
-      description = 'list of package rule files',
+      description = 'list of package rule files/dirs',
    ),
 
    # * alias
@@ -502,7 +503,7 @@ CONFIG_ENTRY_MAP = dict (
    license_map = dict (
       path        = [ 'LICENSEMAP', 'file', ],
       value_type  = 'fs_file',
-      description = None,
+      description = 'dictionary file for translating license strings',
    )
 
    # --- other

diff --git a/roverlay/config/entryutil.py b/roverlay/config/entryutil.py
index 1c6b7ea..cd5f230 100644
--- a/roverlay/config/entryutil.py
+++ b/roverlay/config/entryutil.py
@@ -13,6 +13,41 @@ import textwrap
 
 from roverlay.config.entrymap import CONFIG_ENTRY_MAP
 
+def deref_entry ( name ):
+   entry_name = name.lower()
+   entry_next = CONFIG_ENTRY_MAP [entry_name]
+   while isinstance ( entry_next, str ):
+      entry_name = entry_next
+      entry_next = CONFIG_ENTRY_MAP [entry_name]
+   return ( entry_name, entry_next )
+# --- end of deref_entry (...) ---
+
+def deref_entry_safe ( name ):
+   visited    = set()
+   entry_name = name.lower()
+   entry_next = CONFIG_ENTRY_MAP [entry_name]
+
+   while isinstance ( entry_next, str ):
+      visited.add ( entry_name )
+      entry_name = entry_next
+      entry_next = CONFIG_ENTRY_MAP [entry_name]
+
+      if entry_name in visited:
+         raise Exception (
+         "cyclic config entry detected for {!r}!".format ( name )
+      )
+
+   return ( entry_name, entry_next )
+# --- end of deref_entry_safe (...) ---
+
+def find_config_path ( name ):
+   entry_name, entry =  deref_entry_safe ( name )
+   try:
+      return entry ['path']
+   except KeyError:
+      return entry_name.split ( '_' )
+# --- end of find_config_path (...) ---
+
 def _iter_entries():
    """Iterates through all entries in CONFIG_ENTRY_MAP and yields config
    entry information (entry name, description).
@@ -23,10 +58,12 @@ def _iter_entries():
          # entry is disabled
          pass
       elif isinstance ( entry, dict ):
-         if 'description' in entry:
-            yield ( name, entry ['description'] )
-         elif 'desc' in entry:
-            yield ( name, entry ['desc'] )
+         description = entry.get ( 'description' ) or entry.get ( 'desc' )
+         if description:
+            if isinstance ( description, str ):
+               yield ( name, description )
+            else:
+               yield ( name, '\n'.join ( map ( str, description ) ) )
          else:
             yield ( name, )
       elif isinstance ( entry, str ) and entry:


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/config/
@ 2013-07-10 15:10 André Erdmann
  0 siblings, 0 replies; 10+ messages in thread
From: André Erdmann @ 2013-07-10 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     caba066014710bd69e7978933a6f73cbe7a30f3f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 15:03:47 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 15:03:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=caba0660

roverlay/config/const: "fix" INSTALLINFO.libexec

---
 roverlay/config/const.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roverlay/config/const.py b/roverlay/config/const.py
index e7ad4c1..b0a0b6e 100644
--- a/roverlay/config/const.py
+++ b/roverlay/config/const.py
@@ -19,7 +19,8 @@ _CONSTANTS = dict (
    portdir = '/usr/portage',
 
    INSTALLINFO = dict (
-      libexec = '/usr/libexec/roverlay', # ::LIBEXEC::
+      # FIXME: rename key
+      libexec = '/usr/share/roverlay', # ::LIBEXEC::
    ),
 
    # logging defaults are in recipe/easylogger


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/config/
@ 2013-07-08 22:47 André Erdmann
  0 siblings, 0 replies; 10+ messages in thread
From: André Erdmann @ 2013-07-08 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ff676265ea0ea7eb3a3ed7aeaef8dcba4d476b8d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul  8 22:32:29 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul  8 22:32:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ff676265

drop newline in ebuild header

---
 roverlay/config/const.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roverlay/config/const.py b/roverlay/config/const.py
index c78e27c..76a1b55 100644
--- a/roverlay/config/const.py
+++ b/roverlay/config/const.py
@@ -39,7 +39,6 @@ _CONSTANTS = dict (
          '# Copyright 1999-{year:d} Gentoo Foundation\n'
          '# Distributed under the terms of the GNU General Public License v2\n'
          '# $Header: $\n'
-         '\n'
       ).format ( year=time.gmtime()[0] ),
       # EAPI=N and inherit <eclasses> are no longer part of the default header
       eapi = 4,


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/
@ 2013-06-19 18:59 André Erdmann
  2013-06-19 18:58 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  0 siblings, 1 reply; 10+ messages in thread
From: André Erdmann @ 2013-06-19 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8dab755d9d1d5f0955fc602b10421085525794d8
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 19 18:43:14 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 19 18:43:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8dab755d

roverlay config: add CACHEDIR, TMPDIR

---
 roverlay/config/entrymap.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 4dbce44..65f2df5 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -432,6 +432,24 @@ CONFIG_ENTRY_MAP = dict (
    # * alias
    package_rules = 'package_rule_files',
 
+   # --- package rules
+
+   # == other ==
+
+   cachedir = dict (
+      path        = [ 'CACHEDIR', 'root', ],
+      value_type  = 'fs_dir',
+      description = 'directory for cache data',
+   ),
+
+   tmpdir = dict (
+      path        = [ 'TMPDIR', 'root', ],
+      value_type  = 'fs_dir',
+      description = 'directory for temporary data',
+   ),
+
+   # --- other
+
 )
 
 del fs_file, fs_abslist, is_fs_file, is_yesno, is_log_level, \


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/config/
@ 2013-06-13 16:34 André Erdmann
  0 siblings, 0 replies; 10+ messages in thread
From: André Erdmann @ 2013-06-13 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     c5c9eb0fe096b62e305f4e4ed0b6768a637dd9f3
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 13 16:28:00 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 13 16:28:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c5c9eb0f

roverlay/config/loader: support real types

---
 roverlay/config/loader.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/roverlay/config/loader.py b/roverlay/config/loader.py
index c96598b..182915a 100644
--- a/roverlay/config/loader.py
+++ b/roverlay/config/loader.py
@@ -433,8 +433,15 @@ class ConfigLoader ( object ):
          vtypes = value_type
       elif isinstance ( value_type, str ):
          vtypes = value_type.split ( ':' )
+      elif type ( value_type ) is type:
+         try:
+            return value_type ( value )
+         except ValueError:
+            return None
       else:
-         self.logger.error ( "Unknown data type for value type." )
+         self.logger.error (
+            "Unknown value type {!r}.".format ( value_type )
+         )
          return value
 
       # value_type -> function where function accepts one parameter


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-07-15 22:31 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-30 15:58 [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/ André Erdmann
2013-06-26 17:29 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
  -- strict thread matches above, loose matches on Subject: below --
2013-07-16 16:36 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-15 22:31 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-12 13:57 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-12 13:57 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-12 13:57 André Erdmann
2013-07-11 16:29 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-11 16:44 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-10 15:10 André Erdmann
2013-07-08 22:47 André Erdmann
2013-06-19 18:59 [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-06-19 18:58 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-06-13 16:34 André Erdmann

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