[Checkins] SVN: zc.recipe.deployment/trunk/src/zc/recipe/deployment/ actually create the computed cache & lib directories
Fred Drake
cvs-admin at zope.org
Fri Mar 8 22:10:36 UTC 2013
Log message for revision 130069:
actually create the computed cache & lib directories
Changed:
U zc.recipe.deployment/trunk/src/zc/recipe/deployment/README.txt
U zc.recipe.deployment/trunk/src/zc/recipe/deployment/__init__.py
-=-
Modified: zc.recipe.deployment/trunk/src/zc/recipe/deployment/README.txt
===================================================================
--- zc.recipe.deployment/trunk/src/zc/recipe/deployment/README.txt 2013-03-08 21:51:42 UTC (rev 130068)
+++ zc.recipe.deployment/trunk/src/zc/recipe/deployment/README.txt 2013-03-08 22:10:35 UTC (rev 130069)
@@ -21,6 +21,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -46,6 +52,12 @@
>>> print ls(os.path.join(sample_buildout, 'etc/foo'))
drwxr-xr-x USER GROUP PREFIX/etc/foo
+ >>> print ls(os.path.join(sample_buildout, 'var/cache/foo'))
+ drwxr-xr-x USER GROUP PREFIX/var/cache/foo
+
+ >>> print ls(os.path.join(sample_buildout, 'var/lib/foo'))
+ drwxr-xr-x USER GROUP PREFIX/var/lib/foo
+
>>> print ls(os.path.join(sample_buildout, 'var/log/foo'))
drwxr-xr-x USER GROUP PREFIX/var/log/foo
@@ -86,18 +98,24 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/log/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/run/foo'.
>>> import os
>>> os.path.exists(os.path.join(sample_buildout, 'etc/foo'))
False
+ >>> os.path.exists(os.path.join(sample_buildout, 'var/cache/foo'))
+ False
+ >>> os.path.exists(os.path.join(sample_buildout, 'var/lib/foo'))
+ False
>>> os.path.exists(os.path.join(sample_buildout, 'var/log/foo'))
False
>>> os.path.exists(os.path.join(sample_buildout, 'var/run/foo'))
False
-The log and run directories are only removed if they are empty.
+The cache, lib, log and run directories are only removed if they are empty.
To see that, we'll put a file in each of the directories created:
>>> print system(join('bin', 'buildout')),
@@ -107,6 +125,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -123,6 +147,8 @@
mode 755, user 'USER', group 'GROUP'
>>> write(os.path.join(sample_buildout, 'etc/foo/x'), '')
+ >>> write(os.path.join(sample_buildout, 'var/cache/foo/x'), '')
+ >>> write(os.path.join(sample_buildout, 'var/lib/foo/x'), '')
>>> write(os.path.join(sample_buildout, 'var/log/foo/x'), '')
>>> write(os.path.join(sample_buildout, 'var/run/foo/x'), '')
@@ -135,12 +161,20 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Can't remove non-empty directory 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Can't remove non-empty directory 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Can't remove non-empty directory 'PREFIX/var/log/foo'.
zc.recipe.deployment: Can't remove non-empty directory 'PREFIX/var/run/foo'.
>>> os.path.exists(os.path.join(sample_buildout, 'etc/foo'))
False
+ >>> print ls(os.path.join(sample_buildout, 'var/cache/foo'))
+ drwxr-xr-x USER GROUP PREFIX/var/cache/foo
+
+ >>> print ls(os.path.join(sample_buildout, 'var/lib/foo'))
+ drwxr-xr-x USER GROUP PREFIX/var/lib/foo
+
>>> print ls(os.path.join(sample_buildout, 'var/log/foo'))
drwxr-xr-x USER GROUP PREFIX/var/log/foo
@@ -160,6 +194,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Updating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Updating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Updating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -175,6 +215,8 @@
Creating 'PREFIX/etc/logrotate.d',
mode 755, user 'USER', group 'GROUP'
+ >>> os.remove(os.path.join(sample_buildout, 'var/cache/foo/x'))
+ >>> os.remove(os.path.join(sample_buildout, 'var/lib/foo/x'))
>>> os.remove(os.path.join(sample_buildout, 'var/log/foo/x'))
>>> os.remove(os.path.join(sample_buildout, 'var/run/foo/x'))
@@ -185,11 +227,17 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/log/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/run/foo'.
>>> os.path.exists('' + os.path.join(sample_buildout, 'PREFIX/etc/foo'))
False
+ >>> os.path.exists('' + os.path.join(sample_buildout, 'PREFIX/var/cache/foo'))
+ False
+ >>> os.path.exists('' + os.path.join(sample_buildout, 'PREFIX/var/lib/foo'))
+ False
>>> os.path.exists('' + os.path.join(sample_buildout, 'PREFIX/var/log/foo'))
False
>>> os.path.exists('' + os.path.join(sample_buildout, 'PREFIX/var/run/foo'))
@@ -222,6 +270,12 @@
Creating 'PREFIX/etc/bar',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/bar',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/bar',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/bar',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -240,6 +294,12 @@
>>> print ls(os.path.join(sample_buildout, 'etc/bar'))
drwxr-xr-x USER GROUP PREFIX/etc/bar
+ >>> print ls(os.path.join(sample_buildout, 'var/cache/bar'))
+ drwxr-xr-x USER GROUP PREFIX/var/cache/bar
+
+ >>> print ls(os.path.join(sample_buildout, 'var/lib/bar'))
+ drwxr-xr-x USER GROUP PREFIX/var/lib/bar
+
>>> print ls(os.path.join(sample_buildout, 'var/log/bar'))
drwxr-xr-x USER GROUP PREFIX/var/log/bar
@@ -310,6 +370,8 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/bar'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/bar'.
zc.recipe.deployment: Removing 'PREFIX/var/log/bar'.
zc.recipe.deployment: Removing 'PREFIX/var/run/bar'.
Installing foo.
@@ -317,6 +379,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -564,6 +632,8 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/log/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/run/foo'.
Installing foo.
@@ -571,6 +641,12 @@
Creating 'PREFIX/etc/bar',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/bar',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/bar',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/bar',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -645,6 +721,8 @@
Uninstalling cron.
Uninstalling foo.
Running uninstall recipe.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/bar'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/bar'.
zc.recipe.deployment: Removing 'PREFIX/var/log/bar'.
@@ -703,6 +781,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -872,6 +956,8 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/log/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/run/foo'.
@@ -928,6 +1014,12 @@
Creating 'PREFIX/etc/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
+ Creating 'PREFIX/var/cache/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
+ Creating 'PREFIX/var/lib/foo',
+ mode 755, user 'USER', group 'GROUP'
+ zc.recipe.deployment:
Creating 'PREFIX/var/log/foo',
mode 755, user 'USER', group 'GROUP'
zc.recipe.deployment:
@@ -1003,6 +1095,8 @@
zc.recipe.deployment: Removing 'PREFIX/etc/cron.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/init.d'.
zc.recipe.deployment: Removing 'PREFIX/etc/logrotate.d'.
+ zc.recipe.deployment: Removing 'PREFIX/var/cache/foo'.
+ zc.recipe.deployment: Removing 'PREFIX/var/lib/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/log/foo'.
zc.recipe.deployment: Removing 'PREFIX/var/run/foo'.
Modified: zc.recipe.deployment/trunk/src/zc/recipe/deployment/__init__.py
===================================================================
--- zc.recipe.deployment/trunk/src/zc/recipe/deployment/__init__.py 2013-03-08 21:51:42 UTC (rev 130068)
+++ zc.recipe.deployment/trunk/src/zc/recipe/deployment/__init__.py 2013-03-08 22:10:35 UTC (rev 130069)
@@ -98,6 +98,8 @@
created = []
try:
make_dir(options['etc-directory'], etc_uid, etc_gid, 0755, created)
+ make_dir(options['cache-directory'], run_uid, run_gid, 0755, created)
+ make_dir(options['lib-directory'], run_uid, run_gid, 0755, created)
make_dir(options['log-directory'], run_uid, run_gid, 0755, created)
make_dir(options['run-directory'], run_uid, run_gid, 0750, created)
if options['prefix'] != '/':
@@ -130,7 +132,7 @@
directories = ()
if options.get('prefix', '/') != '/':
directories = ('crontab', 'rc', 'logrotate')
- for d in directories + ('log', 'run'):
+ for d in directories + ('cache', 'lib', 'log', 'run'):
path = options[d+'-directory']
if os.path.isdir(path):
if os.listdir(path):
More information about the checkins
mailing list