[patch] Adds copy option in /etc/vhosts/webapp-config configuration file.

0001-Adds-configurable-copy-option-in-config-file.patch (text/plain), 2.95 KB, created by Devan Franchini (RETIRED) on 2013-05-25 23:20:12 UTC

From bd3eb16ab40576901391cd5f4931e5e45bfe4be0 Mon Sep 17 00:00:00 2001
From: Devan Franchini <[e-mail]>
Date: Sat, 25 May 2013 18:58:47 -0400
Subject: [PATCH] Adds configurable \"copy\" option in config file

Also adds proper passing of copy link_value through config.py to
properly copy files when --copy flag is enabled.
---
 WebappConfig/config.py | 12 ++++++------
 WebappConfig/worker.py |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index fd106c5..924000f 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -490,8 +490,7 @@ class Config:
                          ' when creating virtual files. <NOTE>: some pack'
                          'ages will not work if you use this option')
 
-        group.add_option('--cp',
-                         '--copy',
+        group.add_option('--copy',
                          action='store_true',
                          help = 'Directly copy the webapp files from'
              ' the /usr/share/webapps/ directory when installing'
@@ -999,12 +998,14 @@ class Config:
 
             self.config.set('USER', 'g_link_type', 'soft')
 
-        elif (self.config.has_option('USER', 'g_copy') and
-              self.config.getboolean('USER', 'g_copy')):
+        elif ((self.config.has_option('USER', 'vhost_link_type') and
+               self.config.get('USER', 'vhost_link_type') == 'copy') or
+              (self.config.has_option('USER', 'g_copy') and
+               self.config.getboolean('USER', 'g_copy'))):
 
             OUT.debug('Selecting copying of links', 7)
 
-            self.config.set('USER', 'g_link_type', 'clone')
+            self.config.set('USER', 'g_link_type', 'copy')
 
         else:
 
@@ -1488,7 +1489,6 @@ class Config:
                  'upgrade'  : self.upgrading(),
                  'verbose'  : self.verbose(),
                  'pretend'  : self.pretend()}
-
         return allowed_servers[server](directories,
                                        self.create_permissions(),
                                        handlers,
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index 250f068..f5d18fb 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -280,7 +280,7 @@ class WebappAdd:
         self.__content   = handler['content']
         self.__remove    = handler['removal']
         self.__protect   = handler['protect']
-        self.__link_type = flags['linktype']
+        self.__link_type = flags['linktype'] 
         self.__relative  = flags['relative']
         self.__u         = flags['upgrade']
         self.__v         = flags['verbose']
@@ -508,7 +508,7 @@ class WebappAdd:
                     if self.__v:
                         OUT.warn('Failed to softlink (' + str(e) + ')')
 
-            elif self.__link_type == 'clone':
+            elif self.__link_type == 'copy':
                 try:
 
                     OUT.debug('Trying to copy files directly', 8)
-- 
1.8.1.5