[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     425869c93a66b23dd51a67a613c422d581500555
Author:     Vincent Brillault <gentoo <AT> lerya <DOT> net>
AuthorDate: Mon Apr 22 00:47:03 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 00:52:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=425869c9

WebappConfig/{db,filetype,permissions}.py: code cleanup

1) Add a __str__ method on class PermissionMap for debugging.
2) Fix a wrong debug mesasge in WebappSource.
3) Replace __fix(i).strip() by __fix(i) in FileType since
__fix already strip the input.
4) Add missing cases in FileType comments

Thanks Devan Franchini <twitch153 <AT> hotmail.com> for testing.

X-Gentoo-Bug: 231482
X-Gentoo-Bug-URL: https://bugs.gentoo.org/231482
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 WebappConfig/db.py          |    2 +-
 WebappConfig/filetype.py    |   22 ++++++++++++----------
 WebappConfig/permissions.py |    6 ++++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 37223d0..78597bd 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -551,7 +551,7 @@ class WebappSource(AppHierarchy):
             flist = open(self.appdir() + '/' + server_owned)
             server_files = flist.readlines()
 
-            OUT.debug('Identified config-protected files.', 7)
+            OUT.debug('Identified server-owned files.', 7)
 
             flist.close()
 

diff --git a/WebappConfig/filetype.py b/WebappConfig/filetype.py
index aca8c59..3c5acbb 100644
--- a/WebappConfig/filetype.py
+++ b/WebappConfig/filetype.py
@@ -141,13 +141,13 @@ class FileType:
 
                 OUT.debug('Adding config-server-owned file', 8)
 
-                self.__cache[self.__fix(i).strip()] = 'config-server-owned'
+                self.__cache[self.__fix(i)] = 'config-server-owned'
 
             else:
 
                 OUT.debug('Adding server-owned file', 8)
 
-                self.__cache[self.__fix(i).strip()] = 'server-owned'
+                self.__cache[self.__fix(i)] = 'server-owned'
 
 
     def filetype(self, filename):
@@ -158,11 +158,12 @@ class FileType:
 
         returns one of these:
 
-          server-owned  - file needs to be owned by the webserver user
-                          (and needs to be a local copy)
-          config-owned  - file needs to be owned by the config user
-                          (and needs to be a local copy)
-          virtual       - we do not need a local copy of the file
+          server-owned         - file needs to be owned by the webserver user
+                                 (and needs to be a local copy)
+          config-owned         - file needs to be owned by the config user
+                                 (and needs to be a local copy)
+          config-server-owned  - Both the previous cases at the same time
+          virtual              - we do not need a local copy of the file
 
         NOTE:
           Use get_dirtype(directory) for directories
@@ -190,9 +191,10 @@ class FileType:
 
         returns one of these:
 
-          server-owned  - dir needs to be owned by the webserver user
-          config-owned  - dir needs to be owned by the config user
-          default-owned - we need a local copy, owned by root
+          server-owned         - dir needs to be owned by the webserver user
+          config-owned         - dir needs to be owned by the config user
+          config-server-owned  - Both the previous cases at the same time
+          default-owned        - we need a local copy, owned by root
 
         NOTE:
           Use get_filetype(filename) for files

diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index f430316..ad65df1 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -179,6 +179,12 @@ class PermissionMap:
             self.__permissions = splitted_permissions
             self.__absolute    = False
 
+    def __str__(self):
+      if self.__absolute:
+        return 'Absolute: {}'.format(oct(self.__permissions))
+      else:
+        return 'Relative: {}'.format(self.__permissions)
+
 def get_group(group):
     '''
     Specify a group id either as integer, as string that can