[gentoo-commits] gentoo-x86 commit in app-admin/webapp-config/files: webapp-config-1.50.16-htdocs-symlink.patch webapp-config-1.50.16-absolute-paths.patch

[gentoo-commits] gentoo-x86 commit in app-admin/webapp-config/files: webapp-config-1.50.16-htdocs-symlink.patch webapp-config-1.50.16-absolute-paths.patch

[Benedikt Boehm (hollow)]

hollow      08/02/17 18:06:03

  Added:                webapp-config-1.50.16-htdocs-symlink.patch
                        webapp-config-1.50.16-absolute-paths.patch
  Log:
  fix #166853, #181938, #206669
  (Portage version: 2.1.4.1)

Revision  Changes    Path
1.1                  app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch?rev=1.1&content-type=text/plain

Index: webapp-config-1.50.16-htdocs-symlink.patch
===================================================================
Index: webapp-config-1.50.16/WebappConfig/server.py
===================================================================
--- webapp-config-1.50.16.orig/WebappConfig/server.py
+++ webapp-config-1.50.16/WebappConfig/server.py
@@ -158,7 +158,7 @@ class Basic:
 
         # is the installation directory empty?
 
-        if not os.listdir(self.__destd):
+        if not os.listdir(self.__destd) and os.path.isdir(self.__destd):
             if not self.__p:
                 os.rmdir(self.__destd)
         else:



1.1                  app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch?rev=1.1&content-type=text/plain

Index: webapp-config-1.50.16-absolute-paths.patch
===================================================================
Index: webapp-config-1.50.16/WebappConfig/config.py
===================================================================
--- webapp-config-1.50.16.orig/WebappConfig/config.py
+++ webapp-config-1.50.16/WebappConfig/config.py
@@ -204,6 +204,7 @@ class Config:
             pass
 
         self.__d = {
+            'allow_absolute'               : 'no',
             'config_protect'               : wrapper.config_protect,
             # Necessary to load the config file
             'my_etcconfig'                 : '/etc/vhosts/webapp-config',
@@ -870,8 +871,13 @@ class Config:
         #
         # this makes sure we don't write rubbish into the installs list
 
-        installpath = self.config.get('USER', 'g_htdocsdir') + '/' +     \
-                      self.config.get('USER', 'g_installdir')
+        g_installdir = self.config.get('USER', 'g_installdir')
+
+        if (os.path.isabs(g_installdir)
+            and self.config.get('USER', 'allow_absolute') == 'yes'):
+            installpath = g_installdir
+        else:
+            installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir
 
         installpath = re.compile('/+').sub('/', self.__root + installpath)
 
Index: webapp-config-1.50.16/config/webapp-config
===================================================================
--- webapp-config-1.50.16.orig/config/webapp-config
+++ webapp-config-1.50.16/config/webapp-config
@@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w"
 
 vhost_perms_installdir="0755"
 
+# Allow specifying absolute path names using the -d option?
+allow_absolute="no"
+
 
 # ========================================================================
 # END OF USER-EDITABLE SETTINGS



-- 
gentoo-commits@lists.gentoo.org mailing list