* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-06-14 15:23 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-06-14 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 432bf45c4e76167ac87c1a77e46656fa3a6cde2e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 15:09:41 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 15:22:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=432bf45c
Changed net-www to www-servers
---
WebappConfig/server.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 7bdc2c5..0e3ac73 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -49,6 +49,7 @@ class Basic:
pm):
if self.dep and not self.supported(pm):
+ print self.dep
OUT.die('Your configuration file sets the server type "' + self.name
+ '"\nbut the corresponding package does not seem to be '
'installed!\nPlease "emerge ' + self.dep + '" or correct '
@@ -307,7 +308,7 @@ class Apache(Basic):
name = 'Apache'
desc = 'supports installation on Apache 1 & 2'
- dep = '>=net-www/apache-1.3'
+ dep = '>=www-servers/apache-1.3'
def set_server_user(self):
self.vhost_server_uid = get_user('apache')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-08-06 1:51 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-08-06 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 6f368b35014b67c23d0eea35ed6791718f950af3
Author: Peter Volkov <pva <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 01:50:52 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 01:50:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=6f368b35
Fix overwrite of existing config_protected files
webapp-config records the md5sum of previously modified config
file and any subsequent update removes that file since md5sum of
file in database (.webapp-app-version) is the same as on the disc.
Reported-By: Philippe Chaintreuil
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
X-Gentoo-Bug: 243260
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=243260
---
WebappConfig/content.py | 7 +++++--
WebappConfig/worker.py | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 0549622..a469921 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -321,6 +321,7 @@ class Contents:
ctype,
destination,
path,
+ real_path,
relative = True):
'''
Add an entry to the contents file.
@@ -376,7 +377,9 @@ class Contents:
ctype - internal webapp-config type
- (server-owned | config-owned | virtual)
destination - install dir (normally $G_INSTALLDIR)
- entry - filename inside 'destination'
+ path - filename inside 'destination'
+ real_path - for config-protected files realpath =! path
+ (and this is important for md5)
relative - 1 for storing a relative filename, 0 otherwise
>>> OUT.color_off()
@@ -509,7 +512,7 @@ class Contents:
ctype,
'"' + path + '"',
self.file_time(entry),
- a[1](entry),
+ a[1](real_path),
a[2](entry)]
if self.__v:
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index e73bce3..a5ee172 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -386,6 +386,7 @@ class WebappAdd:
dirtype,
self.__destd,
directory,
+ directory,
self.__relative)
def mkfile(self, filename):
@@ -555,6 +556,7 @@ class WebappAdd:
file_type,
self.__destd,
filename,
+ dst_name,
self.__relative)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 16:42 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 79489e6fbce17400d678363f48965dc9f13660de
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 16:40:58 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 16:41:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=79489e6f
Don't set unused exception variables.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 8 ++++----
WebappConfig/permissions.py | 4 ++--
WebappConfig/server.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 0968dee..83406e8 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -680,7 +680,7 @@ class Config:
result = None
try:
result = PermissionMap(self.maybe_get(permission))
- except Exception, e:
+ except Exception:
OUT.die('You specified an invalid permission value for the'
' variable "' + permission + "'")
return result
@@ -689,7 +689,7 @@ class Config:
result = None
try:
result = Perm.get_user(self.maybe_get(user))
- except KeyError, e:
+ except KeyError:
OUT.die('You specified an invalid user value for the'
' variable "' + user + "'")
return result
@@ -698,7 +698,7 @@ class Config:
result = None
try:
result = Perm.get_group(self.maybe_get(group))
- except KeyError, e:
+ except KeyError:
OUT.die('You specified an invalid group value for the'
' variable "' + group + "'")
return result
@@ -1056,7 +1056,7 @@ class Config:
if not i in ['pn', 'pvr']:
try:
print i.upper() + '="' + self.config.get('USER', i) + '"'
- except InterpolationSyntaxError,e:
+ except InterpolationSyntaxError:
print '# Failed to evaluate: ' + i.upper()
sys.exit(0)
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index ea77d97..64d5f3d 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -206,7 +206,7 @@ def get_group(group):
if type(group) != types.IntType:
try:
ngroup = int(group)
- except ValueError, e:
+ except ValueError:
ngroup = -1
else:
# The value is an integer
@@ -254,7 +254,7 @@ def get_user(user):
if type(user) != types.IntType:
try:
nuser = int(user)
- except ValueError, e:
+ except ValueError:
nuser = -1
else:
# The value is an integer
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 8779475..ab17bd9 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -57,7 +57,7 @@ class Basic:
try:
self.set_server_user()
- except KeyError, e:
+ except KeyError:
OUT.die('The user for the server type "' + self.name
+ '" does not exist!')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 16:50 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 16:50 UTC (permalink / raw
To: gentoo-commits
commit: ab63707059e517154e3cd5b0f704384e8c74cea0
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 16:49:57 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 16:50:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=ab637070
Update syntax of setting exceptions for compatibility with Python 3.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 4 ++--
WebappConfig/content.py | 2 +-
WebappConfig/dotconfig.py | 2 +-
WebappConfig/permissions.py | 8 ++++----
WebappConfig/sandbox.py | 2 +-
WebappConfig/worker.py | 6 +++---
WebappConfig/wrapper.py | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 83406e8..4e176da 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -54,7 +54,7 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
def get(self, section, option):
try:
return ConfigParser.SafeConfigParser.get(self, section, option)
- except Exception, e:
+ except Exception as e:
error = '\nThere is a problem with your configuration file or' \
' an environment variable.\n' \
'webapp-config tried to read the variable "' + str(option) \
@@ -760,7 +760,7 @@ class Config:
try:
self.config.read(self.__d['my_etcconfig'])
- except Exception, e:
+ except Exception as e:
OUT.die('The config file '
+ self.config.get('USER', 'my_etcconfig') +
' cannot be read by the configuration parser.'
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index a469921..1683387 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -304,7 +304,7 @@ class Contents:
os.write(fd, '\n'.join(values))
os.close(fd)
- except Exception, e:
+ except Exception as e:
OUT.warn('Failed to write content file ' + dbpath + '!\n'
+ 'Error was: ' + str(e))
else:
diff --git a/WebappConfig/dotconfig.py b/WebappConfig/dotconfig.py
index 4fc47db..be01126 100644
--- a/WebappConfig/dotconfig.py
+++ b/WebappConfig/dotconfig.py
@@ -260,7 +260,7 @@ class DotConfig:
os.write(fd, '\n'.join(info))
os.close(fd)
- except Exception, e:
+ except Exception as e:
OUT.die('Unable to write to ' + self.__dot_config()
+ '\nError was: ' + str(e))
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index 64d5f3d..966c610 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -217,14 +217,14 @@ def get_group(group):
try:
# Try to match the integer to a group id
gid = grp.getgrgid(ngroup)[2]
- except KeyError, e:
+ except KeyError as e:
pass
if gid == -1:
# No success yet. Try to match to the group name
try:
gid = grp.getgrnam(str(group))[2]
- except KeyError, e:
+ except KeyError as e:
raise KeyError('The given group "' + str(group)
+ '" does not exist!')
@@ -265,14 +265,14 @@ def get_user(user):
try:
# Try to match the integer to a user id
uid = pwd.getpwuid(nuser)[2]
- except KeyError, e:
+ except KeyError as e:
pass
if uid == -1:
# No success yet. Try to match to the user name
try:
uid = pwd.getpwnam(str(user))[2]
- except KeyError, e:
+ except KeyError as e:
raise KeyError('The given user "' + str(user)
+ '" does not exist!')
return uid
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index a15dd61..10873fa 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -96,7 +96,7 @@ class Sandbox:
if not pid:
try:
self._exec(command, self.env, fd_pipes)
- except Exception, e:
+ except Exception as e:
# We need to catch _any_ exception so that it doesn't
# propagate out of this function and cause exiting
# with anything other than os._exit()
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index a5ee172..0841f4a 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -500,7 +500,7 @@ class WebappAdd:
my_contenttype = 'sym'
- except Exception, e:
+ except Exception as e:
if self.__v:
OUT.warn('Failed to softlink (' + str(e) + ')')
@@ -515,7 +515,7 @@ class WebappAdd:
my_contenttype = 'sym'
- except Exception, e:
+ except Exception as e:
if self.__v:
OUT.warn('Failed copy symlink (' + str(e) + ')')
@@ -530,7 +530,7 @@ class WebappAdd:
my_contenttype = 'file'
- except Exception, e:
+ except Exception as e:
if self.__v:
OUT.warn('Failed to hardlink (' + str(e) + ')')
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index 344d809..91185ff 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -48,7 +48,7 @@ def config_protect(cat, pn, pvr, pm):
if pm == "portage":
try:
import portage
- except ImportError, e:
+ except ImportError as e:
OUT.die("Portage libraries not found, quitting:\n%s" % e)
return portage.settings['CONFIG_PROTECT']
@@ -90,7 +90,7 @@ def get_root(config):
if config.config.get('USER', 'package_manager') == "portage":
try:
import portage
- except ImportError, e:
+ except ImportError as e:
OUT.die("Portage libraries not found, quitting:\n%s" % e)
return portage.root
@@ -128,13 +128,13 @@ def package_installed(full_name, pm):
if pm == "portage":
try:
import portage
- except ImportError, e:
+ except ImportError as e:
OUT.die("Portage libraries not found, quitting:\n%s" % e)
try:
t = portage.db[portage.root]["vartree"].dbapi.match(full_name)
# catch the "ambiguous package" Exception
- except ValueError, e:
+ except ValueError as e:
if type(e[0]) == types.ListType:
t = []
for cp in e[0]:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 17:11 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 17:11 UTC (permalink / raw
To: gentoo-commits
commit: be41e707eea09113c3d1a7b4cf255b1044e48ef3
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:10:44 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:10:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=be41e707
Delete some unused variables and imports.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 4 ++--
WebappConfig/content.py | 1 -
WebappConfig/filetype.py | 2 +-
WebappConfig/permissions.py | 8 ++++----
WebappConfig/sandbox.py | 8 +-------
WebappConfig/server.py | 2 +-
WebappConfig/worker.py | 1 -
WebappConfig/wrapper.py | 4 +---
8 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 4e176da..e4f4819 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -19,9 +19,9 @@
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, os.path, optparse, ConfigParser, re, shlex, socket, time
+import sys, os, os.path, ConfigParser, re, socket, time
-from ConfigParser import MAX_INTERPOLATION_DEPTH, DEFAULTSECT, \
+from ConfigParser import MAX_INTERPOLATION_DEPTH, \
ParsingError, InterpolationMissingOptionError, \
InterpolationSyntaxError, \
InterpolationDepthError
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 1683387..c535e52 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -28,7 +28,6 @@ import md5, re, os, os.path
from WebappConfig.debug import OUT
from WebappConfig.permissions import PermissionMap
-import WebappConfig.wrapper as wrapper
# ========================================================================
# Content handler
diff --git a/WebappConfig/filetype.py b/WebappConfig/filetype.py
index 41aff8f..1de66ba 100644
--- a/WebappConfig/filetype.py
+++ b/WebappConfig/filetype.py
@@ -22,7 +22,7 @@ __version__ = "$Id: filetype.py 245 2006-01-13 16:57:29Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os.path, re
+import re
from WebappConfig.debug import OUT
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index 966c610..13b2c3f 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -217,14 +217,14 @@ def get_group(group):
try:
# Try to match the integer to a group id
gid = grp.getgrgid(ngroup)[2]
- except KeyError as e:
+ except KeyError:
pass
if gid == -1:
# No success yet. Try to match to the group name
try:
gid = grp.getgrnam(str(group))[2]
- except KeyError as e:
+ except KeyError:
raise KeyError('The given group "' + str(group)
+ '" does not exist!')
@@ -265,14 +265,14 @@ def get_user(user):
try:
# Try to match the integer to a user id
uid = pwd.getpwuid(nuser)[2]
- except KeyError as e:
+ except KeyError:
pass
if uid == -1:
# No success yet. Try to match to the user name
try:
uid = pwd.getpwnam(str(user))[2]
- except KeyError as e:
+ except KeyError:
raise KeyError('The given user "' + str(user)
+ '" does not exist!')
return uid
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index 10873fa..698a566 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -24,9 +24,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os, os.path, string, time, sys
-
-from WebappConfig.debug import OUT
+import os, os.path, string, sys
# stolen from portage
if os.path.isdir("/proc/%i/fd" % os.getpid()):
@@ -152,10 +150,6 @@ class Sandbox:
@returns: Never returns (calls os.execve)
"""
- # If the process we're creating hasn't been given a name
- # assign it the name of the executable.
- opt_name = os.path.basename(binary[0])
-
# Set up the command's pipes.
my_fds = {}
# To protect from cases where direct assignment could
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index ab17bd9..5aece77 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -19,7 +19,7 @@
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, os.path, re
+import os, os.path
from WebappConfig.debug import OUT
from WebappConfig.worker import WebappRemove, WebappAdd
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index 0841f4a..d1ece72 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -26,7 +26,6 @@ __version__ = "$Id: worker.py 245 2006-01-13 16:57:29Z wrobel $"
import sys, os, os.path, shutil, stat, re
from WebappConfig.debug import OUT
-import WebappConfig.wrapper as wrapper
# ========================================================================
# Helper functions
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index 91185ff..e0d1e87 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, types, string
+import os, types, string
from WebappConfig.debug import OUT
@@ -59,7 +59,6 @@ def config_protect(cat, pn, pvr, pm):
fi, fo, fe = os.popen3(cmd)
fi.close()
result_lines = fo.readlines()
- error_lines = fe.readlines()
fo.close()
fe.close()
@@ -105,7 +104,6 @@ def get_root(config):
fi, fo, fe = os.popen3(cmd)
fi.close()
result_lines = fo.readlines()
- error_lines = fe.readlines()
fo.close()
fe.close()
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 17:23 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 17:23 UTC (permalink / raw
To: gentoo-commits
commit: f345724471322f989701e25bb0462a8b5f458dd2
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:23:04 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:23:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=f3457244
Update syntax of octal numbers for compatibility with Python 3.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/content.py | 2 +-
WebappConfig/db.py | 4 ++--
WebappConfig/dotconfig.py | 2 +-
WebappConfig/worker.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index c535e52..d6cf3f6 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -298,7 +298,7 @@ class Contents:
if not self.__p:
try:
fd = os.open(self.appdb(), os.O_WRONLY | os.O_CREAT,
- self.__perm(0600))
+ self.__perm(0o600))
os.write(fd, '\n'.join(values))
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 856761e..aa78c24 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -370,14 +370,14 @@ class WebappDB(AppHierarchy):
OUT.die('No package specified!')
if not self.__p and not os.path.isdir(os.path.dirname(dbpath)):
- os.makedirs(os.path.dirname(dbpath), self.__dir_perm(0755))
+ os.makedirs(os.path.dirname(dbpath), self.__dir_perm(0o755))
fd = None
if not self.__p:
fd = os.open(dbpath,
os.O_WRONLY | os.O_APPEND | os.O_CREAT,
- self.__file_perm(0600))
+ self.__file_perm(0o600))
entry = str(int(time.time())) + ' ' + str(user) + ' ' + str(group)\
+ ' ' + installdir + '\n'
diff --git a/WebappConfig/dotconfig.py b/WebappConfig/dotconfig.py
index be01126..c9a5ba1 100644
--- a/WebappConfig/dotconfig.py
+++ b/WebappConfig/dotconfig.py
@@ -255,7 +255,7 @@ class DotConfig:
fd = os.open(self.__dot_config(),
os.O_WRONLY | os.O_CREAT,
- self.__perm(0600))
+ self.__perm(0o600))
os.write(fd, '\n'.join(info))
os.close(fd)
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index d1ece72..d57a55c 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -375,7 +375,7 @@ class WebappAdd:
OUT.debug('Creating directory', 8)
if not self.__p:
- os.makedirs(dst_dir, perm(0755))
+ os.makedirs(dst_dir, perm(0o755))
os.chown(dst_dir,
user,
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 17:34 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 9dbea9ba4215269135dce31918073d09dd9aa790
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:34:14 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:34:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=9dbea9ba
Don't use has_key() for compatibility with Python 3.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 12 ++++++------
WebappConfig/debug.py | 12 ++++++------
WebappConfig/dotconfig.py | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index e4f4819..65f8efa 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -797,11 +797,11 @@ class Config:
# Handle -E
envmap = []
- if (options.__dict__.has_key('envall') and
+ if ('envall' in options.__dict__ and
options.__dict__['envall']):
envmap = 'all'
- elif (options.__dict__.has_key('envvar') and
+ elif ('envvar' in options.__dict__ and
options.__dict__['envvar']):
envmap = [x.lower() for x in options.__dict__['envvar']]
@@ -818,7 +818,7 @@ class Config:
key.lower(),
value)
- if (options.__dict__.has_key('define') and
+ if ('define' in options.__dict__ and
options.__dict__['define']):
for i in options.__dict__['define']:
if '=' in i:
@@ -827,7 +827,7 @@ class Config:
i.split('=')[1])
# Indicate that --dir was found
- if options.__dict__.has_key('dir'):
+ if 'dir' in options.__dict__:
self.flag_dir = True
# Map command line options into the configuration
@@ -845,12 +845,12 @@ class Config:
'bug_report' : 'g_bugreport'}
for i in option_to_config.keys():
- if options.__dict__.has_key(i) and options.__dict__[i]:
+ if i in options.__dict__ and options.__dict__[i]:
self.config.set('USER', option_to_config[i],
str(options.__dict__[i]))
# handle verbosity
- if (options.__dict__.has_key('pretend')
+ if ('pretend' in options.__dict__
and options.__dict__['pretend']):
self.config.set('USER', 'g_verbose', 'True')
diff --git a/WebappConfig/debug.py b/WebappConfig/debug.py
index 7c14651..c3a5c47 100644
--- a/WebappConfig/debug.py
+++ b/WebappConfig/debug.py
@@ -169,26 +169,26 @@ class Message:
def cli_handle(self, options):
- if (options.__dict__.has_key('debug')
+ if ('debug' in options.__dict__
and options.__dict__['debug']):
self.debug_on()
else:
self.debug_off()
return
- if (options.__dict__.has_key('debug_class_vars')
+ if ('debug_class_vars' in options.__dict__
and options.__dict__['debug_class_vars']):
self.class_variables_on()
else:
self.class_variables_off()
- if (options.__dict__.has_key('debug_nocolor')
+ if ('debug_nocolor' in options.__dict__
and options.__dict__['debug_nocolor']):
self.color_off()
else:
self.color_on()
- if (options.__dict__.has_key('debug_level') and
+ if ('debug_level' in options.__dict__ and
options.__dict__['debug_level']):
dbglvl = int(options.__dict__['debug_level'])
if dbglvl < 0:
@@ -197,7 +197,7 @@ class Message:
dbglvl = 10
self.set_debug_level(dbglvl)
- if (options.__dict__.has_key('debug_verbose') and
+ if ('debug_verbose' in options.__dict__ and
options.__dict__['debug_verbose']):
dbgvrb = int(options.__dict__['debug_verbose'])
if dbgvrb < 1:
@@ -210,7 +210,7 @@ class Message:
('debug_classes', self.set_debug_classes),
('debug_variables', self.set_debug_variables),]:
- if (options.__dict__.has_key(i[0]) and
+ if (i[0] in options.__dict__ and
options.__dict__[i[0]]):
i[1](options.__dict__[i[0]])
diff --git a/WebappConfig/dotconfig.py b/WebappConfig/dotconfig.py
index c9a5ba1..610d1e3 100644
--- a/WebappConfig/dotconfig.py
+++ b/WebappConfig/dotconfig.py
@@ -163,7 +163,7 @@ class DotConfig:
self.read()
- if self.__data.has_key('WEB_CATEGORY'):
+ if 'WEB_CATEGORY' in self.__data:
OUT.notice(self.__data['WEB_CATEGORY'] + ' ' +
self.__data['WEB_PN'] + ' ' +
self.__data['WEB_PVR'])
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 17:50 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 17:50 UTC (permalink / raw
To: gentoo-commits
commit: b693439b662c3d4d2bf6a445cb89c04eb924160f
Author: Michael <kensington <AT> astralcloak <DOT> net>
AuthorDate: Fri Dec 30 17:44:51 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:49:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=b693439b
Forward-compat WEB_CATEGORY variable
Versions previous to 1.50.18 did not include WEB_CATEGORY which was
stored in ${webapp_installed_dir}/.webapp, but newer versions require it.
Make old installations forward-compatible by pretending this variable exists.
Reported-By: Patrick <mail <AT> patrick-nagel.net>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
X-Gentoo-Bug: 355295
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=355295
---
WebappConfig/dotconfig.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebappConfig/dotconfig.py b/WebappConfig/dotconfig.py
index 610d1e3..ad3d894 100644
--- a/WebappConfig/dotconfig.py
+++ b/WebappConfig/dotconfig.py
@@ -119,6 +119,10 @@ class DotConfig:
def __getitem__(self, key):
if key in self.__data.keys():
return self.__data[key]
+ # this key didn't exist in old versions, but new versions
+ # expect it. fix bug 355295
+ elif key == 'WEB_CATEGORY':
+ return ''
def __dot_config(self):
''' Returns the full path to the dot config file.'''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2011-12-30 17:52 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2011-12-30 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 5b1fd173f1709b0eefc4fd6276756e914837f156
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:52:08 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:52:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=5b1fd173
Use isinstance() for compatibility with Python 3.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/permissions.py | 6 +++---
WebappConfig/wrapper.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index 13b2c3f..0bf99ea 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -25,7 +25,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import re, types, grp, pwd
+import re, grp, pwd
# ========================================================================
# Permission Helper
@@ -203,7 +203,7 @@ def get_group(group):
ngroup = -1
# Can we transform the value to an integer?
- if type(group) != types.IntType:
+ if not isinstance(group, int):
try:
ngroup = int(group)
except ValueError:
@@ -251,7 +251,7 @@ def get_user(user):
nuser = -1
# Can we transform the value to an integer?
- if type(user) != types.IntType:
+ if not isinstance(user, int):
try:
nuser = int(user)
except ValueError:
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index e0d1e87..fd4b010 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os, types, string
+import os, string
from WebappConfig.debug import OUT
@@ -133,7 +133,7 @@ def package_installed(full_name, pm):
t = portage.db[portage.root]["vartree"].dbapi.match(full_name)
# catch the "ambiguous package" Exception
except ValueError as e:
- if type(e[0]) == types.ListType:
+ if isinstance(e[0], list):
t = []
for cp in e[0]:
t += portage.db[portage.root]["vartree"].dbapi.match(cp)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: df1ee77098fbb7eda685ffbea88dca9fea18adfd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:13:53 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=df1ee770
Use print() function for compatibility with Python 3.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 4 +-
WebappConfig/db.py | 2 +-
WebappConfig/debug.py | 69 ++++++++++++++++++++++++-----------------------
WebappConfig/server.py | 2 +-
WebappConfig/version.py | 2 +-
5 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 9ac303e..371602e 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -1055,9 +1055,9 @@ class Config:
for i in self.config.options('USER'):
if not i in ['pn', 'pvr']:
try:
- print i.upper() + '="' + self.config.get('USER', i) + '"'
+ print(i.upper() + '="' + self.config.get('USER', i) + '"')
except InterpolationSyntaxError:
- print '# Failed to evaluate: ' + i.upper()
+ print('# Failed to evaluate: ' + i.upper())
sys.exit(0)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index aa78c24..fc221bf 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -456,7 +456,7 @@ class WebappDB(AppHierarchy):
OUT.info(' ' + i[3].strip(), 1)
else:
# This is a simplified form for the webapp.eclass
- print i[3].strip()
+ print(i[3].strip())
# ========================================================================
# Handler for /usr/share/webapps
diff --git a/WebappConfig/debug.py b/WebappConfig/debug.py
index c3a5c47..7236e27 100644
--- a/WebappConfig/debug.py
+++ b/WebappConfig/debug.py
@@ -5,6 +5,7 @@
# Copyright 2005 Gunnar Wrobel
# Distributed under the terms of the GNU General Public License v2
+from __future__ import print_function
__version__ = "$Id: debug.py 159 2005-11-10 09:48:25Z wrobel $"
#################################################################################
@@ -294,7 +295,7 @@ class Message:
## Output Functions
def notice (self, note):
- print note
+ print(note)
def info (self, info, level = 4):
@@ -304,7 +305,7 @@ class Message:
return
for i in info.split('\n'):
- print self.maybe_color('green', '* ') + i
+ print(self.maybe_color('green', '* ') + i)
def status (self, message, status, info = 'ignored'):
@@ -316,7 +317,7 @@ class Message:
return
for i in lines[0:-1]:
- print self.maybe_color('green', '* ') + i
+ print(self.maybe_color('green', '* ') + i)
i = lines[-1]
@@ -330,8 +331,8 @@ class Message:
else:
result = '[' + self.maybe_color('yellow', info) + ']'
- print self.maybe_color('green', '* ') + i + ' ' + '.' * (58 - len(i)) \
- + ' ' + result
+ print(self.maybe_color('green', '* ') + i + ' ' + '.' * (58 - len(i)) \
+ + ' ' + result)
def warn (self, warn, level = 4):
@@ -341,14 +342,14 @@ class Message:
return
for i in warn.split('\n'):
- print self.maybe_color('yellow', '* ') + i
+ print(self.maybe_color('yellow', '* ') + i)
def error (self, error):
error = str(error)
for i in error.split('\n'):
- print >> self.error_out, self.maybe_color('red', '* ') + i
+ print(self.maybe_color('red', '* ') + i, file=self.error_out)
self.has_error = True
def die (self, error):
@@ -429,11 +430,11 @@ class Message:
if lines > 0:
for j in range(lines):
## Print line with continuation marker
- print >> self.debug_out, ls + '// ' + x[0:60] + ' \\'
+ print(ls + '// ' + x[0:60] + ' \\', file=self.debug_out)
## Remove printed characters from output
x = x[60:]
## Print final line
- print >> self.debug_out, ls + '// ' + x
+ print(ls + '// ' + x, file=self.debug_out)
if self.debug_vrb == 1:
# Top line indicates class and method
@@ -442,60 +443,60 @@ class Message:
c += 'Class: ' + str(callerobject.__class__.__name__) + ' | '
if callermethod:
c += 'Method: ' + str(callermethod)
- print >> self.debug_out, '// ' + c
+ print('// ' + c, file=self.debug_out)
# Selected variables follow
if callerlocals:
for i,j in callerlocals.items():
- print >> self.debug_out, '// ' \
- + self.maybe_color('turquoise', str(i)) + ':' + str(j)
+ print('// ' \
+ + self.maybe_color('turquoise', str(i)) + ':' + str(j), file=self.debug_out)
# Finally the message
- print >> self.debug_out, self.maybe_color('yellow', message)
+ print(self.maybe_color('yellow', message), file=self.debug_out)
return
if self.debug_vrb == 3:
- print >> self.debug_out, ls + '/////////////////////////////////' + \
- '////////////////////////////////'
+ print(ls + '/////////////////////////////////' + \
+ '////////////////////////////////', file=self.debug_out)
# General information about what is being debugged
#(module name or similar)
- print >> self.debug_out, ls + '// ' + self.debug_env
- print >> self.debug_out, ls + '//-----------------------------------' + \
- '----------------------------'
+ print(ls + '// ' + self.debug_env, file=self.debug_out)
+ print(ls + '//-----------------------------------' + \
+ '----------------------------', file=self.debug_out)
## If the caller is a class print the name here
if callerobject:
- print >> self.debug_out, ls + \
- '// Object Class: ' + str(callerobject.__class__.__name__)
+ print(ls + \
+ '// Object Class: ' + str(callerobject.__class__.__name__), file=self.debug_out)
## If the method has been extracted print it here
if callermethod:
- print >> self.debug_out, ls + '// ' \
- + self.maybe_color('green', 'Method: ') + str(callermethod)
+ print(ls + '// ' \
+ + self.maybe_color('green', 'Method: ') + str(callermethod), file=self.debug_out)
if self.debug_vrb == 3:
- print >> self.debug_out, ls + '//---------------------------' + \
- '------------------------------------'
+ print(ls + '//---------------------------' + \
+ '------------------------------------', file=self.debug_out)
## Print the information on all available local variables
if callerlocals:
if self.debug_vrb == 3:
- print >> self.debug_out, ls + '//'
- print >> self.debug_out, ls + '// VALUES '
+ print(ls + '//', file=self.debug_out)
+ print(ls + '// VALUES ', file=self.debug_out)
for i,j in callerlocals.items():
- print >> self.debug_out, ls + '// ------------------> ' \
- + self.maybe_color('turquoise', str(i)) + ':'
+ print(ls + '// ------------------> ' \
+ + self.maybe_color('turquoise', str(i)) + ':', file=self.debug_out)
breaklines(str(j))
if self.debug_vrb == 3:
- print >> self.debug_out, ls + '//------------------------------'\
- '---------------------------------'
+ print(ls + '//------------------------------'\
+ '---------------------------------', file=self.debug_out)
# Finally print the message
breaklines(self.maybe_color('yellow', message))
if self.debug_vrb == 3:
- print >> self.debug_out, ls + '//-------------------------------' + \
- '--------------------------------'
- print >> self.debug_out, ls + '/////////////////////////////////' + \
- '////////////////////////////////'
+ print(ls + '//-------------------------------' + \
+ '--------------------------------', file=self.debug_out)
+ print(ls + '/////////////////////////////////' + \
+ '////////////////////////////////', file=self.debug_out)
## gloabal message handler
OUT = Message('webapp-config')
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 2272d76..f67ecdb 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -49,7 +49,7 @@ class Basic:
pm):
if self.dep and not self.supported(pm):
- print self.dep
+ print(self.dep)
OUT.die('Your configuration file sets the server type "' + self.name
+ '"\nbut the corresponding package does not seem to be '
'installed!\nPlease "emerge ' + self.dep + '" or correct '
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index c09a903..ddf6c9d 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -16,4 +16,4 @@
WCVERSION = '1.50.18'
if __name__ == '__main__':
- print WCVERSION
+ print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 527726c8eee3b433bc0bd3453b2074ccbb823f89
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:36:50 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=527726c8
Partially synchronize WebappConfig.sandbox.get_open_fds() with portage.process.get_open_fds().
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/sandbox.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index 0fddcce..88436c3 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -27,9 +27,14 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $"
import os, os.path, sys
# stolen from portage
+try:
+ import resource
+ max_fd_limit = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
+except ImportError:
+ max_fd_limit = 256
if os.path.isdir("/proc/%i/fd" % os.getpid()):
def get_open_fds():
- return map(int, [fd for fd in os.listdir("/proc/%i/fd" % os.getpid()) if fd.isdigit()])
+ return (int(fd) for fd in os.listdir("/proc/%i/fd" % os.getpid()) if fd.isdigit())
else:
def get_open_fds():
return range(max_fd_limit)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 70b36b1615bf83b30d164a674b7ae8c3968d45f6
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:53:47 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=70b36b16
Update configparser imports for compatibility with Python 3.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 371602e..37fb0e2 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -19,12 +19,19 @@
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, os.path, ConfigParser, re, socket, time
-
-from ConfigParser import MAX_INTERPOLATION_DEPTH, \
- ParsingError, InterpolationMissingOptionError, \
- InterpolationSyntaxError, \
- InterpolationDepthError
+import sys, os, os.path, re, socket, time
+
+try:
+ # Python 3
+ import configparser
+ if sys.version_info >= (3, 2):
+ from configparser import ConfigParser as configparser_ConfigParser
+ else:
+ from configparser import SafeConfigParser as configparser_ConfigParser
+except ImportError:
+ # Python 2
+ import ConfigParser as configparser
+ from ConfigParser import SafeConfigParser as configparser_ConfigParser
import WebappConfig.server
import WebappConfig.permissions as Perm
@@ -40,20 +47,20 @@ from WebappConfig.permissions import PermissionMap
# BashParser class
# ------------------------------------------------------------------------
-class BashConfigParser(ConfigParser.SafeConfigParser):
+class BashConfigParser(configparser_ConfigParser):
_interpvar_match = re.compile(r"(%\(([^)]+)\)s|\$\{([^}]+)\})").match
def __init__(self, defaults=None):
self.error_action = 1
- ConfigParser.SafeConfigParser.__init__(self, defaults)
+ configparser_ConfigParser.__init__(self, defaults)
def on_error(self, action = 0):
self.error_action = action
def get(self, section, option):
try:
- return ConfigParser.SafeConfigParser.get(self, section, option)
+ return configparser_ConfigParser.get(self, section, option)
except Exception as e:
error = '\nThere is a problem with your configuration file or' \
' an environment variable.\n' \
@@ -69,8 +76,8 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
return ''
def _interpolate_some(self, option, accum, rest, section, map, depth):
- if depth > MAX_INTERPOLATION_DEPTH:
- raise InterpolationDepthError(option, section, rest)
+ if depth > configparser.MAX_INTERPOLATION_DEPTH:
+ raise configparser.InterpolationDepthError(option, section, rest)
while rest:
p = rest.find("%")
if p < 0:
@@ -92,7 +99,7 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
elif c == "(" or c == "{":
m = self._interpvar_match(rest)
if m is None:
- raise InterpolationSyntaxError(option, section,
+ raise configparser.InterpolationSyntaxError(option, section,
"bad interpolation variable reference %r" % rest)
var = m.group(2)
if not var:
@@ -102,7 +109,7 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
try:
v = map[var]
except KeyError:
- raise InterpolationMissingOptionError(
+ raise configparser.InterpolationMissingOptionError(
option, section, rest, var)
if "%" in v or "$" in v:
self._interpolate_some(option, accum, v,
@@ -110,7 +117,7 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
else:
accum.append(v)
else:
- raise InterpolationSyntaxError(
+ raise configparser.InterpolationSyntaxError(
option, section,
"'" + c + "' must be followed by '" + c + "', '{', or '(', found: %r" % (rest,))
@@ -187,7 +194,7 @@ class BashConfigParser(ConfigParser.SafeConfigParser):
# raised at the end of the file and will contain a
# list of all bogus lines
if not e:
- e = ParsingError(fpname)
+ e = configparser.ParsingError(fpname)
e.append(lineno, repr(line))
# if any parsing errors occurred, raise an exception
if e:
@@ -1056,7 +1063,7 @@ class Config:
if not i in ['pn', 'pvr']:
try:
print(i.upper() + '="' + self.config.get('USER', i) + '"')
- except InterpolationSyntaxError:
+ except configparser.InterpolationSyntaxError:
print('# Failed to evaluate: ' + i.upper())
sys.exit(0)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 21a203cfb79726d6798ca878e52b8ab39ef9b15a
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:23:28 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=21a203cf
Use str.join() instead of string.join() for compatibility with Python 3.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/sandbox.py | 4 ++--
WebappConfig/wrapper.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index 698a566..bb92c50 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -24,7 +24,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os, os.path, string, sys
+import os, os.path, sys
# stolen from portage
if os.path.isdir("/proc/%i/fd" % os.getpid()):
@@ -55,7 +55,7 @@ class Sandbox:
def get_write(self):
'''Return write paths.'''
- return string.join ( map ( self.get_config, self.__write ), ':' ) \
+ return ':'.join ( map ( self.get_config, self.__write ) ) \
+ self.__syswrite
def get_config(self, option):
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index fd4b010..1897dd6 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os, string
+import os
from WebappConfig.debug import OUT
@@ -62,7 +62,7 @@ def config_protect(cat, pn, pvr, pm):
fo.close()
fe.close()
- return string.join(result_lines, ' ').strip()
+ return ' '.join(result_lines).strip()
else:
OUT.die("Unknown package manager: " + pm)
@@ -156,7 +156,7 @@ def package_installed(full_name, pm):
for i in error_lines:
OUT.warn(i)
- return string.join(result_lines, ' ')
+ return ' '.join(result_lines)
else:
OUT.die("Unknown package manager: " + pm)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: b5f8f0e4f6912080bd59c2779a6892d2b3597c03
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:26:34 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=b5f8f0e4
Use range() instead of xrange() for compatibility with Python 3.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/sandbox.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index bb92c50..0fddcce 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -32,7 +32,7 @@ if os.path.isdir("/proc/%i/fd" % os.getpid()):
return map(int, [fd for fd in os.listdir("/proc/%i/fd" % os.getpid()) if fd.isdigit()])
else:
def get_open_fds():
- return xrange(max_fd_limit)
+ return range(max_fd_limit)
class Sandbox:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 2e80fd31bf94d67944af1bd44491cf67ef08bb06
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jun 29 00:35:12 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=2e80fd31
Do not use cmp() for compatibility with Python 3.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/content.py | 13 +------------
WebappConfig/db.py | 2 +-
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 4e0462b..8e92622 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -548,19 +548,8 @@ class Contents:
''' Get a list of files. This is returned as a list sorted according
to length, so that files lower in the hierarchy can be removed
first.'''
- def lencmp(x, y):
- zx = len(x)
- zy = len(y)
- if zx > zy:
- return -1
- if zy > zx:
- return 1
- return cmp(x, y)
-
installed = self.__content.keys()
- installed.sort(lencmp)
-
- return installed
+ return sorted(installed, key=lambda x: (-len(x), x))
def get_directories(self):
''' Get only the directories as a sorted list.'''
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index ccb7b0e..c925792 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -202,7 +202,7 @@ class WebappDB(AppHierarchy):
varies whith your code location)
>>> sb = [i[1] for i in b.list_locations().items()]
- >>> sb.sort(lambda x,y: cmp(x[0]+x[1]+x[2],y[0]+y[1]+y[2]))
+ >>> sb.sort(key=lambda x: x[0]+x[1]+x[2])
>>> sb
[['', 'gallery', '1.4.4_p6'], ['', 'gallery', '2.0_rc2'], ['', 'horde', '3.0.5'], ['', 'phpldapadmin', '0.9.7_alpha4']]
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2012-06-29 13:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2012-06-29 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 04f0b4cedab9b28909a8ab028cec0d899105faf2
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jun 29 00:06:50 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=04f0b4ce
Update WebappConfig.version.WCVERSION.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/version.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index ddf6c9d..e79de15 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -13,7 +13,7 @@
#
# ========================================================================
-WCVERSION = '1.50.18'
+WCVERSION = '1.50.20'
if __name__ == '__main__':
print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-02-12 3:40 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-02-12 3:40 UTC (permalink / raw
To: gentoo-commits
commit: ac3067b0dfbed842035c29a2200ecef1635037eb
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 03:36:55 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 03:39:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=ac3067b0
WebappConfig/db.py: do not leave behind stray install files
Thanks Devan Franchini <twitch153 <AT> hotmail.com> for testing.
X-Gentoo-Bug: 213130
X-Gentoo-Bug-URL: https://bugs.gentoo.org/213130
Reported-by: Priit Laes <plaes <AT> plaes.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/db.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index c925792..37223d0 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -340,6 +340,8 @@ class WebappDB(AppHierarchy):
if not self.__p:
installs = open(dbpath, 'w')
installs.write('\n'.join(newentries) + '\n')
+ if not self.has_installs():
+ os.unlink(dbpath)
else:
OUT.info('Pretended to remove installation ' + installdir)
OUT.info('Final DB content:\n' + '\n'.join(newentries) + '\n')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-03-09 13:45 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-03-09 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 66f8f0c9b7857cd97f3d128bcc7040aa1654e99c
Author: Christian Affolter <c.affolter <AT> stepping-stone <DOT> ch>
AuthorDate: Sat Mar 9 13:41:50 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 13:44:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=66f8f0c9
WebappConfig/ebuild.py: don't ignore vhost_config_dir value
Thanks Devan Franchini <twitch153 <AT> hotmail.com> for testing.
X-Gentoo-Bug: 438276
X-Gentoo-Bug-URL: https://bugs.gentoo.org/438276
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/ebuild.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
index b22d2ae..03c0c57 100644
--- a/WebappConfig/ebuild.py
+++ b/WebappConfig/ebuild.py
@@ -275,7 +275,7 @@ class Ebuild:
v_root = self.get_config('vhost_root')
v_cgi = self.get_config('g_cgibindir')
- v_conf = v_root + '/'
+ v_conf = self.get_config('vhost_config_dir')
v_err = v_root + '/' + self.get_config('my_errorsbase')
v_icon = v_root + '/' + self.get_config('my_iconsbase')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-03-14 2:19 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-03-14 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 84767b807e47e38443c7f6107b2d28d8e4595485
Author: Vincent Brillault <gentoo <AT> lerya <DOT> net>
AuthorDate: Thu Mar 14 02:15:54 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 02:19:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=84767b80
WebappConfig/worker.py: correct permissions for server-owned dirs
app-admin/webapp-config uses 'os.makedirs(dst_dir, perm(0x755))'
to create new directories without any 'os.chown' after. If the
configuration contains 'vhost_perms_serverowned_dir="0775"' or
vhost_perms_serverowned_dir="g+w" those permissions will be filtered
with the default python umask which is '022', resulting in a '0755'
permission instead of a '0775' one.
Thanks Devan Franchini <twitch153 <AT> hotmail.com> for testing.
X-Gentoo-Bug: 434894
X-Gentoo-Bug-URL: https://bugs.gentoo.org/434894
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/worker.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index fbf8f92..07a2f1a 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -288,6 +288,8 @@ class WebappAdd:
self.config_protected_dirs = []
+ os.umask(0)
+
def mkdirs(self, directory = ''):
'''
Create a set of directories
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-03-23 4:05 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-03-23 4:05 UTC (permalink / raw
To: gentoo-commits
commit: cf69dd1bedf749e28789262bdb4d41767fec4f91
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Sat Mar 23 04:00:01 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 04:04:25 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=cf69dd1b
WebappConfig/wrapper.py: do not use portage.root to retrive $ROOT
On a prefix system, portage.root equals portage.settings['EROOT'] and
not portage.settings['ROOT'], but we need the latter.
X-Gentoo-Bug: 434894
X-Gentoo-Bug-URL: https://bugs.gentoo.org/434894
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/wrapper.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index c6896ab..623f37a 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -90,7 +90,7 @@ def get_root(config):
except ImportError as e:
OUT.die("Portage libraries not found, quitting:\n%s" % e)
- return portage.root
+ return portage.settings['ROOT']
elif config.config.get('USER', 'package_manager') == "paludis":
cat = config.maybe_get('cat')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-04-22 0:52 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-04-22 0:52 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-03 13:24 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-03 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 81058b615b023de50244c200d420cbbf3f7a49d4
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Fri Jun 21 06:06:29 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 13:04:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=81058b61
Webappconfig/config.py: Adds check for package name and version
This check is done in the run() function if self.work == "clean" to avoid
uninstalling a webapp if the package name and version being listed exist,
but aren't the ones located in the .webapp in the specified directory taken
from the -d flag.
X-Gentoo-Bug: 461410
X-Gentoo-Bug-URL: https://bugs.gentoo.org/461410
---
WebappConfig/config.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index fd106c5..04fb6f2 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -937,12 +937,16 @@ class Config:
self.parser.print_help()
OUT.die('You need to specify at least the application you'
' would like to handle!')
+ else:
+ return self.config.get('USER', 'pn')
def check_version_set(self):
if not self.config.has_option('USER', 'pvr'):
OUT.die('You did not specify which version to handle.\n Use "'
+ self.config.get('USER','g_myname') +
' --help" for usage')
+ else:
+ return self.config.get('USER', 'pvr')
def split_hostname(self):
@@ -1225,10 +1229,12 @@ class Config:
self.__r = wrapper.get_root(self)
wrapper.want_category(self)
- self.check_package_set()
- self.check_version_set()
+ package = self.check_package_set()
+ version = self.check_version_set()
self.set_vars()
+ webapp = package + ' ' + version
+
# special case
#
# if a package has been specified, then chances are that they forgot
@@ -1260,6 +1266,13 @@ class Config:
self.config.set('USER', 'pn', old['WEB_PN'])
self.config.set('USER', 'pvr', old['WEB_PVR'])
+ old_webapp = old['WEB_PN'] + ' ' + old['WEB_PVR']
+
+ if not webapp == old_webapp:
+ OUT.die(webapp + ' does not match ' +
+ old_webapp + ' found in .webapp file at ' +
+ self.installdir() + '.')
+
# we don't want to read the .webapp file if we're upgrading,
# because we've just written the *new* app's details into the file!!
#
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-03 13:24 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-03 13:24 UTC (permalink / raw
To: gentoo-commits
commit: cb8d8aba36328ed5196adca572466e655932d511
Author: Nico Baggus <mlspamcb <AT> noci <DOT> xs4all <DOT> nl>
AuthorDate: Sat Aug 3 13:24:38 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 13:26:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=cb8d8aba
WebappConfig/content.py: use hashlib instead of md5 module
X-Gentoo-Bug: 282831
X-Gentoo-Bug-URL: https://bugs.gentoo.org/282831
---
WebappConfig/content.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 8e92622..966a9cd 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -22,7 +22,7 @@ installation. '''
# Dependencies
# ------------------------------------------------------------------------
-import md5, re, os, os.path
+import hashlib, re, os, os.path
from WebappConfig.debug import OUT
from WebappConfig.permissions import PermissionMap
@@ -531,7 +531,7 @@ class Contents:
def file_md5(self, filename):
''' Return the md5 hash for the file content.'''
- return str(md5.md5(open(filename).read()).hexdigest())
+ return str(hashlib.md5(open(filename).read()).hexdigest())
def file_time(self, filename):
''' Return the last modification time.'''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-03 13:24 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-03 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 3c9308d811778b1cd051bb8370f92dd842cf478d
Author: cmue81 <cmue81 <AT> gmx <DOT> de>
AuthorDate: Sat Aug 3 13:20:14 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 13:22:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=3c9308d8
WebappConfig/wrapper.py: fix paludis support
X-Gentoo-Bug: 428378
X-Gentoo-Bug-URL: https://bugs.gentoo.org/428378
---
WebappConfig/wrapper.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index 623f37a..a9e2a3b 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -52,7 +52,7 @@ def config_protect(cat, pn, pvr, pm):
return portage.settings['CONFIG_PROTECT']
elif pm == "paludis":
- cmd="paludis --log-level silent --no-color --environment-variable %s/%s CONFIG_PROTECT" % (cat,pn)
+ cmd="cave print-id-environment-variable -b --format '%%v\n' --variable-name CONFIG_PROTECT %s/%s" % (cat,pn)
fi, fo, fe = os.popen3(cmd)
fi.close()
@@ -97,7 +97,7 @@ def get_root(config):
pn = config.maybe_get('pn')
if cat and pn:
- cmd="paludis --log-level silent --no-color --environment-variable %s/%s ROOT" % (cat,pn)
+ cmd="cave print-id-environment-variable -b --format '%%v\n' --variable-name ROOT %s/%s" % (cat,pn)
fi, fo, fe = os.popen3(cmd)
fi.close()
@@ -141,7 +141,7 @@ def package_installed(full_name, pm):
elif pm == "paludis":
- cmd="paludis --best-version %s" % (full_name)
+ cmd="cave print-best-version '%s'" % (full_name)
fi, fo, fe = os.popen3(cmd)
fi.close()
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-06 11:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-06 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 80c2ec65e4379472300d7a8e9f65ea4c968fbaf6
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 01:59:31 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 11:02:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=80c2ec65
Fix indentation
---
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index bf55d1e..bb86a55 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -962,7 +962,7 @@ class Config:
OUT.die('You need to specify at least the application you'
' would like to handle!')
else:
- return self.config.get('USER', 'pn')
+ return self.config.get('USER', 'pn')
def check_version_set(self):
if not self.config.has_option('USER', 'pvr'):
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-06 11:00 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-06 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 1bc28049300625a3b24a632e2aacb5776937c19b
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 01:59:31 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 11:03:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=1bc28049
WebappConfig/config.py: fix indentation
---
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index bf55d1e..bb86a55 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -962,7 +962,7 @@ class Config:
OUT.die('You need to specify at least the application you'
' would like to handle!')
else:
- return self.config.get('USER', 'pn')
+ return self.config.get('USER', 'pn')
def check_version_set(self):
if not self.config.has_option('USER', 'pvr'):
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-08-06 12:28 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-08-06 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 04f4db803893c4bc10f5121af7f80f9cb6e9bf3c
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 01:59:31 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 12:30:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=04f4db80
WebappConfig/config.py: fix indentation
X-Gentoo-Bug: 479884
X-Gentoo-Bug-URL: https://bugs.gentoo.org/479884
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index bf55d1e..bb86a55 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -962,7 +962,7 @@ class Config:
OUT.die('You need to specify at least the application you'
' would like to handle!')
else:
- return self.config.get('USER', 'pn')
+ return self.config.get('USER', 'pn')
def check_version_set(self):
if not self.config.has_option('USER', 'pvr'):
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-24 18:20 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-09-24 18:20 UTC (permalink / raw
To: gentoo-commits
commit: afa258cf46649321d12bb4d408b69ec9b35439c1
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Sun Sep 22 23:30:54 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 18:19:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=afa258cf
WebappConfig/permissions.py: Corrected syntax for eval() function.
When the permissions octal was being passed to the eval() function they
were previously not being evaluated with python3.2 due to the fact that
the octal value was not being declared as an octal. To fix this, it was
simply stated that the octal value was one by appending '0o' to the
values being piped into the eval() function.
X-GENTOO-BUG: 481298
X-GENTOO-BUG-URL: https://bugs.gentoo.org/481298
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/permissions.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index ad65df1..2e506e1 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -161,7 +161,7 @@ class PermissionMap:
if re.compile('[0-7]{4}').match(permissions):
self.__absolute = True
- self.__permissions = eval(permissions)
+ self.__permissions = eval("0o"+permissions)
else:
# Split on commas first
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-24 18:20 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-09-24 18:20 UTC (permalink / raw
To: gentoo-commits
commit: e279816d1bf27cfd83796c1d46d4a0cd08f76e67
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Mon Sep 23 01:08:18 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 18:20:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=e279816d
WebappConfig/content.py: Adds use of create_md5() function.
This update adds the use of compat.py into content.py and makes use of
the create_md5() function.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/content.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 966a9cd..7eff223 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -26,7 +26,7 @@ import hashlib, re, os, os.path
from WebappConfig.debug import OUT
from WebappConfig.permissions import PermissionMap
-
+from WebappConfig.compat import create_md5
# ========================================================================
# Content handler
# ------------------------------------------------------------------------
@@ -531,7 +531,7 @@ class Contents:
def file_md5(self, filename):
''' Return the md5 hash for the file content.'''
- return str(hashlib.md5(open(filename).read()).hexdigest())
+ create_md5(filename)
def file_time(self, filename):
''' Return the last modification time.'''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-24 18:20 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-09-24 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 20379939bf866babfd2dbec133d5cb59013ca451
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Mon Sep 23 00:40:09 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 18:19:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=20379939
WebappConfig/compat.py: Adds compatibility check for file_md5().
When the file_md5() function is called in python3.2+ a hash file is
supposed to be created, and on a if an object is unicode, it needs to be
encoded prior to hashing. In order to do this, a file called compat.py
has a function in it called create_md5(); this function checks the
hexidecimal python version and based on the version, either encodes the
file before it hashes, or simply returns the md5 hash.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/compat.py | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
new file mode 100644
index 0000000..536bb2a
--- /dev/null
+++ b/WebappConfig/compat.py
@@ -0,0 +1,27 @@
+#!/usr/bin/python -O
+#
+# /usr/sbin/webapp-config
+# Python script for managing the deployment of web-based
+# applications
+#
+# Originally written for the Gentoo Linux distribution
+#
+# Copyright (c) 1999-2007 Authors
+# Released under v2 of the GNU GPL
+#
+# Author(s) Stuart Herbert
+# Renat Lumpau <rl03@gentoo.org>
+# Gunnar Wrobel <wrobel@gentoo.org>
+#
+# ========================================================================
+
+import hashlib, os, os.path, sys
+
+def create_md5(filename):
+ if hex(sys.hexversion) >= '0x3020000':
+ filename = open(filename).read()
+ encoded_file = filename.encode('utf8')
+ return str(hashlib.md5(encoded_file).hexdigest())
+ else:
+ return str(hashlib.md5(open(filename).read()).hexdigest())
+
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-24 18:20 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2013-09-24 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 58a7dbcc8faf452f4e0355dbff42a2882a8b0e2b
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Mon Sep 23 03:40:30 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 18:20:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=58a7dbcc
WebappConfig/db.py: Converts dict_keys into a list to allow sorting.
When appending the --list-installs flag to webapp-config and using
python3.2+ you will receive an error declaring: "AttributeError:
'dict_keys' object has no attribute 'sort'". By setting keys as a list
you are then able to list your webapp-config installs without getting
any errors. This has also been tested on python2.7.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/db.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 78597bd..8db20fc 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -441,7 +441,7 @@ class WebappDB(AppHierarchy):
if not loc and self.__v:
OUT.die('No virtual installs found!')
- keys = loc.keys()
+ keys = list(loc.keys())
keys.sort()
for j in keys:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-26 3:44 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-09-26 3:44 UTC (permalink / raw
To: gentoo-commits
commit: 88b6987a7e20d4eeb1d8aa26fcebd8cd1b9a435d
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Thu Sep 26 03:44:04 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 03:44:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=88b6987a
WebappConfig/content.py: Fixed inconsistent tab in file where create_md5() is declared.
---
WebappConfig/content.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 7eff223..f9106ff 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -531,7 +531,7 @@ class Contents:
def file_md5(self, filename):
''' Return the md5 hash for the file content.'''
- create_md5(filename)
+ create_md5(filename)
def file_time(self, filename):
''' Return the last modification time.'''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-09-26 4:03 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-09-26 4:03 UTC (permalink / raw
To: gentoo-commits
commit: 6e1e2220cbbc91d48eabe5b0c416c7ecae6fa8a2
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Thu Sep 26 04:04:05 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 04:04:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=6e1e2220
WebappConfig/content.py: returns value from create_md5 to prevent nulls.
---
WebappConfig/content.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index f9106ff..de65d1d 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -531,7 +531,7 @@ class Contents:
def file_md5(self, filename):
''' Return the md5 hash for the file content.'''
- create_md5(filename)
+ return create_md5(filename)
def file_time(self, filename):
''' Return the last modification time.'''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-10 0:35 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-10 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 547419993a5d73f103c2729745cc5f2f0dbe1d16
Author: Devan Franchini <twitch153 <AT> hotmail <DOT> com>
AuthorDate: Thu Oct 10 00:25:20 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 00:25:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=54741999
WebappConfig/db.py: Converts keys.packages.keys() into a list.
When webapp-cleaner -C <webapp> on python3.2+ an error will arise
which says that 'dict_keys' object has no attribute 'sort'. To fix
this issue we set the keys to a list. This allows the keys to be
properly sorted without error. Tested in python3.2 and python2.7.
---
WebappConfig/db.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 8db20fc..03449a3 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -673,7 +673,7 @@ class WebappSource(AppHierarchy):
if not packages:
OUT.die('No packages found!')
- keys = packages.keys()
+ keys = list(packages.keys())
keys.sort()
OUT.debug('Check for unused web applications', 7)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:15 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:15 UTC (permalink / raw
To: gentoo-commits
commit: a7b03c25292bfad034c8ef91a8f6f50199bc67e8
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 03:24:15 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:13:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a7b03c25
WebappConfig/compat.py: Revamps create_md5() function.
This second revamp changes the way in which python is opening
the file to create an md5 hash of. Upon calling the open()
function it opens the file to read it, or as a binary. This
allows for consistent behavior when trying to open either a
binary file, or a text file to hash. This method is also much
cleaner and sufficient for forward and backwards compatibility.
Conflicts:
WebappConfig/compat.py
---
WebappConfig/compat.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
index 536bb2a..526b1bc 100644
--- a/WebappConfig/compat.py
+++ b/WebappConfig/compat.py
@@ -15,13 +15,18 @@
#
# ========================================================================
-import hashlib, os, os.path, sys
+import hashlib
def create_md5(filename):
+<<<<<<< HEAD
if hex(sys.hexversion) >= '0x3020000':
filename = open(filename).read()
encoded_file = filename.encode('utf8')
return str(hashlib.md5(encoded_file).hexdigest())
else:
return str(hashlib.md5(open(filename).read()).hexdigest())
+=======
+ with open(filename, 'rb') as f:
+ return str(hashlib.md5(f.read()).hexdigest())
+>>>>>>> 04e9a55... WebappConfig/compat.py: Revamps create_md5() function.
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:18 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:18 UTC (permalink / raw
To: gentoo-commits
commit: c41a4b0cccc8425a9e00bd1c4cebaf50c058588f
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 02:17:00 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:17:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=c41a4b0c
WebappConfig/compat.py: Alters warped compat file from cherry-picking.
---
WebappConfig/compat.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
index 526b1bc..3e567dc 100644
--- a/WebappConfig/compat.py
+++ b/WebappConfig/compat.py
@@ -18,15 +18,5 @@
import hashlib
def create_md5(filename):
-<<<<<<< HEAD
- if hex(sys.hexversion) >= '0x3020000':
- filename = open(filename).read()
- encoded_file = filename.encode('utf8')
- return str(hashlib.md5(encoded_file).hexdigest())
- else:
- return str(hashlib.md5(open(filename).read()).hexdigest())
-=======
with open(filename, 'rb') as f:
return str(hashlib.md5(f.read()).hexdigest())
->>>>>>> 04e9a55... WebappConfig/compat.py: Revamps create_md5() function.
-
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:18 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:18 UTC (permalink / raw
To: gentoo-commits
commit: 82fa79efdbb308f0e850491e48e30db9fa4fc794
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 02:17:11 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:16:29 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=82fa79ef
WebappConfig/config.py: Corrects get() function arguments.
Adds *args, and **kwargs for the wrapper get() function in config.py
in order to add the correct arguments necessary for the get() function
in the ConfigParser class.
---
WebappConfig/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 26eab59..c4b424b 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -58,9 +58,9 @@ class BashConfigParser(configparser_ConfigParser):
def on_error(self, action = 0):
self.error_action = action
- def get(self, section, option):
+ def get(self, section, option, *args, **kwargs):
try:
- return configparser_ConfigParser.get(self, section, option)
+ return configparser_ConfigParser.get(self, section, option, *args, **kwargs)
except Exception as e:
error = '\nThere is a problem with your configuration file or' \
' an environment variable.\n' \
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:40 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:40 UTC (permalink / raw
To: gentoo-commits
commit: a011f2ef970501dcea469a4976962616d5b0cfda
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 03:45:12 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:28:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a011f2ef
WebappConfig/content.py: Encodes md5 content in utf-8 when writing.
---
WebappConfig/content.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index de65d1d..8fe5be9 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -298,7 +298,7 @@ class Contents:
fd = os.open(self.appdb(), os.O_WRONLY | os.O_CREAT,
self.__perm(0o600))
- os.write(fd, '\n'.join(values))
+ os.write(fd, ('\n'.join(values)).encode('utf-8'))
os.close(fd)
except Exception as e:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:40 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:40 UTC (permalink / raw
To: gentoo-commits
commit: a4658f66d4c670e342062d795ac13a54d269920a
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 02:40:41 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:40:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a4658f66
WebappConfig/db.py: Removes cherry-pick message in db.py.
---
WebappConfig/db.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index ba9dcca..11e5dae 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -672,9 +672,7 @@ class WebappSource(AppHierarchy):
if not packages:
OUT.die('No packages found!')
-<<<<<<< HEAD
keys = sorted(packages)
->>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list.
OUT.debug('Check for unused web applications', 7)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:40 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:40 UTC (permalink / raw
To: gentoo-commits
commit: 1365cea62a9ee5ca6f62440c46c71d617e7288fb
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 03:39:05 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:33:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=1365cea6
WebappConfig/db.py converts keys dictionary to sorted list.
Conflicts:
WebappConfig/db.py
---
WebappConfig/db.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index f7b8a48..ba9dcca 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -441,8 +441,7 @@ class WebappDB(AppHierarchy):
if not loc and self.__v:
OUT.die('No virtual installs found!')
- keys = list(loc.keys())
- keys.sort()
+ keys = sorted(loc)
for j in keys:
# The verbose output is meant to be readable for the user
@@ -673,8 +672,9 @@ class WebappSource(AppHierarchy):
if not packages:
OUT.die('No packages found!')
- keys = list(packages.keys())
- keys.sort()
+<<<<<<< HEAD
+ keys = sorted(packages)
+>>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list.
OUT.debug('Check for unused web applications', 7)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:40 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:40 UTC (permalink / raw
To: gentoo-commits
commit: 4450127ac1c2ee959725a4061d07711135f93844
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 03:38:06 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:30:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=4450127a
WebappConfig/db.py: Encodes entry output for .webapp-<app>-<version>.
This encodes the variable entry in utf-8 when writing to a
.webapp-<app>-<version> file, due to previous errors where str
did not support the buffer interface.
---
WebappConfig/db.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 03449a3..f7b8a48 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -385,7 +385,7 @@ class WebappDB(AppHierarchy):
OUT.debug('New record', 7)
if not self.__p:
- os.write(fd, entry)
+ os.write(fd, (entry).encode('utf-8'))
os.close(fd)
else:
OUT.info('Pretended to append installation ' + installdir)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 2:40 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 2:40 UTC (permalink / raw
To: gentoo-commits
commit: a5962e6adaef7201233e235401d50fb96142d7d6
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 03:35:30 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:29:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a5962e6a
WebappConfig/dotconfig.py: Encodes .webapp info in utf-8 when writing.
---
WebappConfig/dotconfig.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/WebappConfig/dotconfig.py b/WebappConfig/dotconfig.py
index ce2845c..cab0392 100644
--- a/WebappConfig/dotconfig.py
+++ b/WebappConfig/dotconfig.py
@@ -248,7 +248,6 @@ class DotConfig:
'# automatically created by Gentoo\'s webapp-config',
'# do NOT edit this file by hand',
'',]
-
for i in self.__tokens:
info.append(i + '="' + self.__data[i] + '"')
@@ -259,7 +258,7 @@ class DotConfig:
os.O_WRONLY | os.O_CREAT,
self.__perm(0o600))
- os.write(fd, '\n'.join(info))
+ os.write(fd, ('\n'.join(info)).encode('utf-8'))
os.close(fd)
except Exception as e:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2013-10-29 19:13 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2013-10-29 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 49445ace79dfeb223d826960ce0fc8539f75c9a8
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 19:08:48 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 19:08:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=49445ace
WebappConfig/config.py: Modifies default interpolation style.
Due to python3.2 using one interpolation style when running ConfigParser
it was necessary to change the interpolation style to the Extended
Interpolation style which allows ConfigParser to interpolate such
variables that follow the style of ${} in config.py and the config
file in /etc/vhosts/webapp-config. For total backwards compatibility
we also needed to change the interpolation style being used in config.py
because it was using a Basic Interpolation style of %(variable)s.
This change has been tested with both python3.2 and python2.7.
---
WebappConfig/config.py | 54 +++++++++++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index c4b424b..1c09488 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -26,6 +26,7 @@ try:
import configparser
if sys.version_info >= (3, 2):
from configparser import ConfigParser as configparser_ConfigParser
+ from configparser import ExtendedInterpolation
else:
from configparser import SafeConfigParser as configparser_ConfigParser
except ImportError:
@@ -53,7 +54,10 @@ class BashConfigParser(configparser_ConfigParser):
def __init__(self, defaults=None):
self.error_action = 1
- configparser_ConfigParser.__init__(self, defaults)
+ if sys.hexversion >= 0x3000000:
+ configparser_ConfigParser.__init__(self, defaults, interpolation=ExtendedInterpolation())
+ else:
+ configparser_ConfigParser.__init__(self, defaults)
def on_error(self, action = 0):
self.error_action = action
@@ -244,7 +248,7 @@ class Config:
'vhost_config_uid' : str(os.getuid()),
'vhost_config_virtual_files' : 'virtual',
'vhost_config_default_dirs' : 'default-owned',
- 'vhost_config_dir' : '%(vhost_root)s/conf',
+ 'vhost_config_dir' : '${vhost_root}/conf',
'vhost_htdocs_insecure' : 'htdocs',
'vhost_htdocs_secure' : 'htdocs-secure',
'vhost_perms_serverowned_dir' : '0775',
@@ -266,16 +270,16 @@ class Config:
'vhost_server_gid' : 'root',
'my_persistroot' : '/var/db/webapps',
'wa_installsbase' : 'installs',
- 'vhost_root' : '/var/www/%(vhost_hostname)s',
- 'g_htdocsdir' : '%(vhost_root)s/%(my_htdocsbase)s',
- 'my_appdir' : '%(my_approot)s/%(my_appsuffix)s',
- 'my_htdocsdir' : '%(my_appdir)s/htdocs',
- 'my_persistdir' : '%(my_persistroot)s/%(my_appsuffix)s',
- 'my_hostrootdir' : '%(my_appdir)s/%(my_hostrootbase)s',
- 'my_cgibindir' : '%(my_hostrootdir)s/%(my_cgibinbase)s',
- 'my_iconsdir' : '%(my_hostrootdir)s/%(my_iconsbase)s',
- 'my_errorsdir' : '%(my_hostrootdir)s/%(my_errorsbase)s',
- 'g_cgibindir' : '%(vhost_root)s/%(my_cgibinbase)s',
+ 'vhost_root' : '/var/www/${vhost_hostname}',
+ 'g_htdocsdir' : '${vhost_root}/${my_htdocsbase}',
+ 'my_appdir' : '${my_approot}/${my_appsuffix}',
+ 'my_htdocsdir' : '${my_appdir}/htdocs',
+ 'my_persistdir' : '${my_persistroot}/${my_appsuffix}',
+ 'my_hostrootdir' : '${my_appdir}/${my_hostrootbase}',
+ 'my_cgibindir' : '${my_hostrootdir}/${my_cgibinbase}',
+ 'my_iconsdir' : '${my_hostrootdir}/${my_iconsbase}',
+ 'my_errorsdir' : '${my_hostrootdir}/${my_errorsbase}',
+ 'g_cgibindir' : '${vhost_root}/${my_cgibinbase}',
'my_approot' : '/usr/share/webapps',
'package_manager' : 'portage',
'allow_absolute' : 'no',
@@ -283,15 +287,15 @@ class Config:
'my_cgibinbase' : 'cgi-bin',
'my_iconsbase' : 'icons',
'my_errorsbase' : 'error',
- 'my_sqlscriptsdir' : '%(my_appdir)s/sqlscripts',
- 'my_hookscriptsdir' : '%(my_appdir)s/hooks',
- 'my_serverconfigdir': '%(my_appdir)s/conf',
- 'wa_configlist' : '%(my_appdir)s/config-files',
- 'wa_solist' : '%(my_appdir)s/server-owned-files',
- 'wa_virtuallist' : '%(my_appdir)s/virtuals',
- 'wa_installs' : '%(my_persistdir)s/%(wa_installsbase)s',
+ 'my_sqlscriptsdir' : '${my_appdir}/sqlscripts',
+ 'my_hookscriptsdir' : '${my_appdir}/hooks',
+ 'my_serverconfigdir': '${my_appdir}/conf',
+ 'wa_configlist' : '${my_appdir}/config-files',
+ 'wa_solist' : '${my_appdir}/server-owned-files',
+ 'wa_virtuallist' : '${my_appdir}/virtuals',
+ 'wa_installs' : '${my_persistdir}/${wa_installsbase}',
'wa_postinstallinfo':
- '%(my_appdir)s/post-install-instructions.txt',
+ '${my_appdir}/post-install-instructions.txt',
}
# Setup basic defaults
@@ -338,9 +342,9 @@ class Config:
self.config.set('USER', 'persist_suffix', '/'.join([cat,pn,pvr]))
if os.path.isdir(new_layout):
- self.config.set('USER', 'my_appsuffix', '%(cat)s/%(pn)s/%(pvr)s')
+ self.config.set('USER', 'my_appsuffix', '${cat}/${pn}/${pvr}')
elif os.path.isdir(old_layout):
- self.config.set('USER', 'my_appsuffix', '%(pn)s/%(pvr)s')
+ self.config.set('USER', 'my_appsuffix', '${pn}/${pvr}')
self.config.set('USER', 'cat', '')
else:
OUT.die('Unable to determine location of master copy')
@@ -349,7 +353,7 @@ class Config:
OUT.debug('Checking for old layout', 7)
if os.path.isdir(old_layout):
- self.config.set('USER', 'my_appsuffix', '%(pn)s/%(pvr)s')
+ self.config.set('USER', 'my_appsuffix', '${pn}/${pvr}')
self.config.set('USER', 'cat', '')
# no category info at all is available, so drop it from persist_suffix
self.config.set('USER', 'persist_suffix', '/'.join([pn,pvr]))
@@ -920,10 +924,10 @@ class Config:
if (self.config.has_option('USER', 'g_secure') and
self.config.getboolean('USER', 'g_secure')):
self.config.set('USER', 'my_htdocsbase',
- '%(vhost_htdocs_secure)s')
+ '${vhost_htdocs_secure}')
else:
self.config.set('USER', 'my_htdocsbase',
- '%(vhost_htdocs_insecure)s')
+ '${vhost_htdocs_insecure}')
# set the action to be performed
work = ['install', 'clean', 'upgrade', 'list_installs',
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-01 1:09 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-01 1:09 UTC (permalink / raw
To: gentoo-commits
commit: f55ff6ec821d0f7aa6f097aa40867d3d59537013
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 01:03:45 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 01:03:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=f55ff6ec
WebappConfig/ebuild.py: Alters doctest output to default values.
On line 232 on ebuild.py the testing of the documentation was failing
due to not returning full variables and instead returning a varaible
along with "..." in the place of any part of a variable that can change.
The placement of the "..." was causing the doctest to fail upon emerge.
X-Gentoo-Bug: 430010
X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
---
WebappConfig/ebuild.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
index 03c0c57..363d144 100644
--- a/WebappConfig/ebuild.py
+++ b/WebappConfig/ebuild.py
@@ -235,27 +235,27 @@ class Ebuild:
POST-INSTALL INSTRUCTIONS
=================================================================
<BLANKLINE>
- MY_HOSTROOTDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot
- MY_HTDOCSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/htdocs
- MY_CGIBINDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/cgi-bin
+ MY_HOSTROOTDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot
+ MY_HTDOCSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/htdocs
+ MY_CGIBINDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/cgi-bin
MY_INSTALLDIR: /
- MY_ICONSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/icons
- MY_SERVERCONFIGDIR: .../tests/testfiles/share-webapps/horde/3.0.5/conf
- MY_ERRORSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/error
- MY_SQLSCRIPTSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/sqlscripts
- VHOST_ROOT: /var/www/...
- VHOST_HTDOCSDIR: /var/www/.../htdocs
- VHOST_CGIBINDIR: /var/www/.../cgi-bin
- VHOST_CONFDIR: /var/www/.../
- VHOST_ERRORSDIR: /var/www/.../error
- VHOST_ICONSDIR: /var/www/.../icons
- VHOST_HOSTNAME: ...
+ MY_ICONSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/icons
+ MY_SERVERCONFIGDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/conf
+ MY_ERRORSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/error
+ MY_SQLSCRIPTSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/sqlscripts
+ VHOST_ROOT: /var/www/66-152-109-110.tvc-ip.com
+ VHOST_HTDOCSDIR: /var/www/66-152-109-110.tvc-ip.com/htdocs
+ VHOST_CGIBINDIR: /var/www/66-152-109-110.tvc-ip.com/cgi-bin
+ VHOST_CONFDIR: /var/www/66-152-109-110.tvc-ip.com/conf
+ VHOST_ERRORSDIR: /var/www/66-152-109-110.tvc-ip.com/error
+ VHOST_ICONSDIR: /var/www/66-152-109-110.tvc-ip.com/icons
+ VHOST_HOSTNAME: 66-152-109-110.tvc-ip.com
VHOST_SERVER: apache
VHOST_APPDIR: /
- VHOST_CONFIG_UID: ...
- VHOST_CONFIG_GID: ...
- VHOST_SERVER_UID: ...
- VHOST_SERVER_GID: ...
+ VHOST_CONFIG_UID: 250
+ VHOST_CONFIG_GID: 250
+ VHOST_SERVER_UID: root
+ VHOST_SERVER_GID: root
VHOST_DEFAULT_UID: 0
VHOST_DEFAULT_GID: 0
VHOST_PERMS_SERVEROWNED_DIR: 0775
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-02 1:47 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-02 1:47 UTC (permalink / raw
To: gentoo-commits
commit: b977b6f3510b99da6dddab7f87c70cbee49dcf75
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 01:47:02 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 01:47:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=b977b6f3
WebappConfig/ebuild.py Restores changes done by previous commit.
---
WebappConfig/ebuild.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
index 363d144..03c0c57 100644
--- a/WebappConfig/ebuild.py
+++ b/WebappConfig/ebuild.py
@@ -235,27 +235,27 @@ class Ebuild:
POST-INSTALL INSTRUCTIONS
=================================================================
<BLANKLINE>
- MY_HOSTROOTDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot
- MY_HTDOCSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/htdocs
- MY_CGIBINDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/cgi-bin
+ MY_HOSTROOTDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot
+ MY_HTDOCSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/htdocs
+ MY_CGIBINDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/cgi-bin
MY_INSTALLDIR: /
- MY_ICONSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/icons
- MY_SERVERCONFIGDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/conf
- MY_ERRORSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot/error
- MY_SQLSCRIPTSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/sqlscripts
- VHOST_ROOT: /var/www/66-152-109-110.tvc-ip.com
- VHOST_HTDOCSDIR: /var/www/66-152-109-110.tvc-ip.com/htdocs
- VHOST_CGIBINDIR: /var/www/66-152-109-110.tvc-ip.com/cgi-bin
- VHOST_CONFDIR: /var/www/66-152-109-110.tvc-ip.com/conf
- VHOST_ERRORSDIR: /var/www/66-152-109-110.tvc-ip.com/error
- VHOST_ICONSDIR: /var/www/66-152-109-110.tvc-ip.com/icons
- VHOST_HOSTNAME: 66-152-109-110.tvc-ip.com
+ MY_ICONSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/icons
+ MY_SERVERCONFIGDIR: .../tests/testfiles/share-webapps/horde/3.0.5/conf
+ MY_ERRORSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/error
+ MY_SQLSCRIPTSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/sqlscripts
+ VHOST_ROOT: /var/www/...
+ VHOST_HTDOCSDIR: /var/www/.../htdocs
+ VHOST_CGIBINDIR: /var/www/.../cgi-bin
+ VHOST_CONFDIR: /var/www/.../
+ VHOST_ERRORSDIR: /var/www/.../error
+ VHOST_ICONSDIR: /var/www/.../icons
+ VHOST_HOSTNAME: ...
VHOST_SERVER: apache
VHOST_APPDIR: /
- VHOST_CONFIG_UID: 250
- VHOST_CONFIG_GID: 250
- VHOST_SERVER_UID: root
- VHOST_SERVER_GID: root
+ VHOST_CONFIG_UID: ...
+ VHOST_CONFIG_GID: ...
+ VHOST_SERVER_UID: ...
+ VHOST_SERVER_GID: ...
VHOST_DEFAULT_UID: 0
VHOST_DEFAULT_GID: 0
VHOST_PERMS_SERVEROWNED_DIR: 0775
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 6c959d04e217d5954b22a567f1ed8767a3c9002c
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 08:31:16 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:12:44 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=6c959d04
WebappConfig/db.py: Removes printing of 'action' when calling prune_database().
---
WebappConfig/db.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index d0913a9..d22020a 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -432,7 +432,6 @@ class WebappDB(AppHierarchy):
loc = self.read_db()
- print(action)
if not loc and self.__v:
OUT.die('No virtual installs found!')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: af1bd6b54ef751af96ec800e256a6e91412401e8
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 22:11:07 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:11:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=af1bd6b5
WebappConfig/db.py: Adds prune_db() function.
This function will check for "stray" webapp installation entries in
the installs files located in /var/db/webapps/<package name>/<version>.
This function is not implemented yet.
X-Gentoo-Bug: 490090
X-Gentoo-Bug-URL: https://bugs.gentoo.org/490090
---
WebappConfig/db.py | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 11e5dae..37bfdc9 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -424,6 +424,43 @@ class WebappDB(AppHierarchy):
return result
+ def prune_db(self):
+ '''
+ Prunes the installs files to ensure no webapp
+ is incorrectly listed as installed.
+ '''
+
+ loc = self.read_db()
+
+ if not loc and self.__v:
+ OUT.die('No virtual installs found!')
+
+ files = self.list_locations()
+ keys = sorted(loc)
+
+ for j in keys:
+ for i in loc[j]:
+ appdir = i[3].strip()
+ # We check to see if the webapp is installed.
+ if not os.path.exists(appdir+'/.webapp'):
+ if self.__v:
+ OUT.warn('No .webapp file found in dir: ')
+ OUT.warn(appdir)
+ OUT.warn('Assuming webapp is no longer installed.')
+ OUT.warn('Pruning entry from database.')
+
+ for installs in files.keys():
+ contents = open(installs).readlines()
+ new_entries = ''
+ for entry in contents:
+ # Grab all the other entries but the one that
+ # isn't installed.
+ if not re.search('.* ' + appdir +'\\n', entry):
+ new_entries += entry
+ f = open(installs, 'w')
+ f.write(new_entries)
+ f.close()
+
def has_installs(self):
''' Return True in case there are any virtual install locations
listed in the db file '''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 89a991a2b20b149c672c9054a1f9ed5305d5a6b5
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 08:35:04 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:12:05 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=89a991a2
WebappConfig/{db,config}.py: Adds support for prune-database() function.
This renames the prune-db() function to prune-database() as well as
adding a command line option to call the function and implements it
in config.py.
X-Gentoo-Bug: 490090
X-Gentoo-Bug-URL: https://bugs.gentoo.org/490090
---
WebappConfig/config.py | 24 ++++++++++++++++++++++--
WebappConfig/db.py | 35 +++++++++++++++++++++--------------
2 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 1c09488..4df2f27 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -565,7 +565,7 @@ class Config:
group.add_option('-V',
'--verbose',
- action='store_true',
+ action='store_true',
help = 'Output even more information than normal'
)
@@ -593,6 +593,14 @@ class Config:
'or version number as arguments to restrict the '
'listing.')
+ group.add_option('--prune-database',
+ '--pd',
+ type = 'choice',
+ choices = ['pretend',
+ 'clean'],
+ help = 'This will list all outdated entries in '
+ 'the webapp-config "database".')
+
group.add_option('--show-installed',
'--si',
action='store_true',
@@ -932,7 +940,7 @@ class Config:
# set the action to be performed
work = ['install', 'clean', 'upgrade', 'list_installs',
'list_servers', 'list_unused_installs',
- 'show_installed', 'show_postinst',
+ 'prune_database', 'show_installed', 'show_postinst',
'show_postupgrade', 'check_config', 'query']
for i in work:
@@ -940,6 +948,9 @@ class Config:
self.work = i
break
+ if options.__dict__.get('prune_database'):
+ self.prune_action = options.__dict__.get('prune_database')
+
OUT.debug('Checking command line arguments', 1)
if len(args) > 0:
@@ -1134,6 +1145,15 @@ class Config:
self.create_webapp_db( self.maybe_get('cat'),
self.maybe_get('pn'),
self.maybe_get('pvr')).listinstalls()
+ if self.work == 'prune_database':
+ # Get the handler for the virtual install db. If the action is equal
+ # to clean, then it'll simply prune the "db" of outdated entries.
+ # If it's not set to clean, then it'll list the outdated entries
+ # in the db to be cleaned out.
+ self.__r = wrapper.get_root(self)
+ self.create_webapp_db( self.maybe_get('cat'),
+ self.maybe_get('pn'),
+ self.maybe_get('pvr')).prune_database(self.prune_action)
if self.work == 'show_installed':
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 37bfdc9..d0913a9 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -424,42 +424,49 @@ class WebappDB(AppHierarchy):
return result
- def prune_db(self):
+ def prune_database(self, action):
'''
Prunes the installs files to ensure no webapp
is incorrectly listed as installed.
'''
loc = self.read_db()
-
+
+ print(action)
if not loc and self.__v:
OUT.die('No virtual installs found!')
files = self.list_locations()
keys = sorted(loc)
+ if action != 'clean':
+ OUT.warn('This is a list of all outdated entries that would be removed: ')
for j in keys:
for i in loc[j]:
appdir = i[3].strip()
# We check to see if the webapp is installed.
+ # TODO: Fix algorithm to see if this is an outdated
+ # entry.
if not os.path.exists(appdir+'/.webapp'):
if self.__v:
OUT.warn('No .webapp file found in dir: ')
OUT.warn(appdir)
OUT.warn('Assuming webapp is no longer installed.')
OUT.warn('Pruning entry from database.')
-
- for installs in files.keys():
- contents = open(installs).readlines()
- new_entries = ''
- for entry in contents:
- # Grab all the other entries but the one that
- # isn't installed.
- if not re.search('.* ' + appdir +'\\n', entry):
- new_entries += entry
- f = open(installs, 'w')
- f.write(new_entries)
- f.close()
+ if action == 'clean':
+ for installs in files.keys():
+ contents = open(installs).readlines()
+ new_entries = ''
+ for entry in contents:
+ # Grab all the other entries but the one that
+ # isn't installed.
+ if not re.search('.* ' + appdir +'\\n', entry):
+ new_entries += entry
+ f = open(installs, 'w')
+ f.write(new_entries)
+ f.close()
+ else:
+ OUT.warn(appdir)
def has_installs(self):
''' Return True in case there are any virtual install locations
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 57b21e97297fa924403726f604176074d7de002a
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 08:49:56 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:12:23 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=57b21e97
WebappConfig/config.py: Cleans whitespace.
---
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 4df2f27..9ade0b6 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -565,7 +565,7 @@ class Config:
group.add_option('-V',
'--verbose',
- action='store_true',
+ action='store_true',
help = 'Output even more information than normal'
)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: d6a06ebe012ac80bf1ae57298116cdd8a63f454d
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 03:57:01 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:14:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=d6a06ebe
WebappConfig/db.py: Slightly alters prune_database() algorithm.
When the prune_database() function checks to see if a webapp is
installed in the directory the database says it's supposed to be
installed in it originally checked to see if a .webapp file existed
in the directory. But due to the fact that a .webapp file could exist
in a directory and not be the webapp that is listed as installed in
that directory it was decided that checking the existance of the
.webapp-<webapp>-<version> file would be better as it confirms that
a webapp exists in that directory and it is the webapp that it is
supposed to be.
---
WebappConfig/db.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index d22020a..228b2c8 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -444,9 +444,7 @@ class WebappDB(AppHierarchy):
for i in loc[j]:
appdir = i[3].strip()
# We check to see if the webapp is installed.
- # TODO: Fix algorithm to see if this is an outdated
- # entry.
- if not os.path.exists(appdir+'/.webapp'):
+ if not os.path.exists(appdir+'/.webapp-'+j):
if self.__v:
OUT.warn('No .webapp file found in dir: ')
OUT.warn(appdir)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 21870d2a1597f1d22fcf27cedc4f4382ff07229f
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 03:43:10 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:13:30 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=21870d2a
WebappConfig/ebuild.py: Nulls doctest code in run_var()
Due to the variable nature of the output of the run_var() function it
is unrealistic to create doctest code that will not fail a test. This
is mainly due to the fact that there are particular variables that may
never be the same on any two user's systems. It has been decided that
the best solution would be to simply "comment out" the doctest code
to prevent it from running and causing failures.
X-Gentoo-Bug: 430010
X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
---
WebappConfig/ebuild.py | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
index 03c0c57..29ec893 100644
--- a/WebappConfig/ebuild.py
+++ b/WebappConfig/ebuild.py
@@ -201,35 +201,35 @@ class Ebuild:
The procedure from above is repeated to set up the default
environment:
- >>> import WebappConfig.config
- >>> config = WebappConfig.config.Config()
- >>> config.config.set('USER', 'my_htdocsbase', 'htdocs')
- >>> config.config.set('USER', 'pn', 'horde')
- >>> config.config.set('USER', 'pvr', '3.0.5')
- >>> import os.path
- >>> here = os.path.dirname(os.path.realpath(__file__))
- >>> config.config.set('USER', 'my_approot', here +
- ... '/tests/testfiles/share-webapps')
- >>> my_approot = config.config.get('USER', 'my_approot')
- >>> my_appdir = my_approot + "/horde/3.0.5"
- >>> config.config.set('USER', 'my_appdir', my_appdir)
- >>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')
- >>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')
- >>> config.config.set('USER', 'my_errorsbase', 'error')
- >>> config.config.set('USER', 'my_iconsbase', 'icons')
- >>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))
- >>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))
- >>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))
- >>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))
+ ">>> import WebappConfig.config"
+ ">>> config = WebappConfig.config.Config()"
+ ">>> config.config.set('USER', 'my_htdocsbase', 'htdocs')"
+ ">>> config.config.set('USER', 'pn', 'horde')"
+ ">>> config.config.set('USER', 'pvr', '3.0.5')"
+ ">>> import os.path"
+ ">>> here = os.path.dirname(os.path.realpath(__file__))"
+ ">>> config.config.set('USER', 'my_approot', here +"
+ "... '/tests/testfiles/share-webapps')"
+ ">>> my_approot = config.config.get('USER', 'my_approot')"
+ ">>> my_appdir = my_approot + "/horde/3.0.5""
+ ">>> config.config.set('USER', 'my_appdir', my_appdir)"
+ ">>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')"
+ ">>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')"
+ ">>> config.config.set('USER', 'my_errorsbase', 'error')"
+ ">>> config.config.set('USER', 'my_iconsbase', 'icons')"
+ ">>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))"
+ ">>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))"
+ ">>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))"
+ ">>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))"
Time to create the ebuild handler:
- >>> a = Ebuild(config)
+ ">>> a = Ebuild(config)"
The dummy post-install file should display all the variables
that are exported here:
- >>> a.show_postinst() #doctest: +ELLIPSIS
+ ">>> a.show_postinst() #doctest: +ELLIPSIS
<BLANKLINE>
=================================================================
POST-INSTALL INSTRUCTIONS
@@ -270,7 +270,7 @@ class Ebuild:
PVR: 3.0.5
<BLANKLINE>
=================================================================
- <BLANKLINE>
+ <BLANKLINE>"
'''
v_root = self.get_config('vhost_root')
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 832ef59a5e80f7792ddcbaec5730c701078ac621
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 21:38:02 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:15:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=832ef59a
WebappConfig/db.py: Properly closes install file after writing.
When webapp-config cleans out a webapp installation it needs to
remove the database entry of the file from it's designated installs
file. If more than one database entry is in the installs file it
should still list the database entry for the webapp that isn't being
removed. The logic is all there in db.py but after the file has
rewritten the entries it doesn't close the file properly and causes
a failure in the check right after the write(), which then unlinks
the installs file and removes the entries from webapp-config's
database.
X-Gentoo-Bug:494520
X-Gentoo-Bug-URL: https://bugs.gentoo.org/494520
---
WebappConfig/db.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 228b2c8..2d70cb9 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -340,6 +340,7 @@ class WebappDB(AppHierarchy):
if not self.__p:
installs = open(dbpath, 'w')
installs.write('\n'.join(newentries) + '\n')
+ installs.close()
if not self.has_installs():
os.unlink(dbpath)
else:
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: a609bb9032596bf750e013bc61777405c39f96e6
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 01:23:29 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:14:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a609bb90
WebappConfig/content.py: Nulls doctest code in add() function.
Due to the variable nature of the output in the add() function in
content.py it was dicussed that the best decision would be to disable
the failing doctest code and prevent it from causing failures.
X-Gentoo-Bug: 430010
X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
---
WebappConfig/content.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 8fe5be9..c635f5a 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -379,71 +379,71 @@ class Contents:
(and this is important for md5)
relative - 1 for storing a relative filename, 0 otherwise
- >>> OUT.color_off()
- >>> import os.path
- >>> here = os.path.dirname(os.path.realpath(__file__))
+ OUT.color_off()
+ import os.path
+ here = os.path.dirname(os.path.realpath(__file__))
One for pretending:
- >>> a = Contents(here + '/tests/testfiles/contents/app/',
+ a = Contents(here + '/tests/testfiles/contents/app/',
... package = 'test', version = '1.0',
... pretend = True)
And this one is for real:
- >>> b = Contents(here + '/tests/testfiles/contents/app/',
+ b = Contents(here + '/tests/testfiles/contents/app/',
... package = 'test', version = '1.0')
Pretend to add a file:
- >>> a.add('file', 'config-owned',
+ a.add('file', 'config-owned',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/test1', relative = True)
* pretending to add: file 1 config-owned "test1"
Lets not pretend this time:
- >>> b.add('file', 'config-owned',
+ b.add('file', 'config-owned',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/test1', relative = True)
- >>> b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
+ b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
'file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
Lets produce an error with a file that does not exist:
- >>> b.add('file', 'config-owned',
+ b.add('file', 'config-owned',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/nothere', relative = True) #doctest: +ELLIPSIS
* Cannot access file .../tests/testfiles/contents/app/nothere to add it as installation content. This should not happen!
Other file types:
- >>> b.add('hardlink', 'config-owned',
+ b.add('hardlink', 'config-owned',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/test2', relative = True)
- >>> b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
+ b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
'file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
- >>> b.add('dir', 'default-owned',
+ b.add('dir', 'default-owned',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/dir1', relative = True)
- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
'dir 1 default-owned "dir1" ... 0 '
- >>> b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
+ b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
... path = '/dir1',
... relative = False)
- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
'dir 0 default-owned ".../tests/testfiles/contents/app/dir1" ... 0 '
Q: Is the full link to the target what we want?
A: Yes, since the link will still be ok even if we move the directory.
- >>> b.add('sym', 'virtual',
+ b.add('sym', 'virtual',
... destination = here + '/tests/testfiles/contents/app/',
... path = '/test3', relative = True)
- >>> b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
+ b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
'sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1'
- >>> b.db_print() #doctest: +ELLIPSIS
+ b.db_print() #doctest: +ELLIPSIS
file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249
file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249
sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: fca6446d6c9181d6956676309dfc5a34f9aaca29
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 06:30:12 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:13:16 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=fca6446d
WebappConfig/config.py: Uses maybe_get() function instead of get().
This changes the use of the get() function in the split_hostname()
function in favor of the maybe_get() function. This change still
allows vhost_subdomain_# variables to be set in /etc/vhosts/webapp-config
without the risk of it being overwritten except due to the use of the
maybe_get() function it will no longer give warnings to the user if
a vhost_subdomain_# variable is not found. This is ideal because
it removes the need of masking the warning in the get() function.
X-Gentoo-Bug: 300250
X-Gentoo-Bug-URL: https://bugs.gentoo.org/300250
X-Gentoo-Bug: 349491
X-Gentoo-Bug-URL: https://bugs.gentoo.org/349491
---
WebappConfig/config.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index e251ca6..c0ea645 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -75,8 +75,6 @@ class BashConfigParser(configparser_ConfigParser):
'ures.'
if self.error_action == 0:
OUT.die(error)
- elif self.error_action == 1 and re.search('^vhost_subdomain_\d+', option):
- pass
elif self.error_action == 1:
OUT.warn(error)
return ''
@@ -996,7 +994,7 @@ class Config:
j = len(subdomains)
for i in subdomains:
- if not self.config.get('USER', 'vhost_subdomain_' + str(j)):
+ if not self.maybe_get('USER', 'vhost_subdomain_' + str(j)):
self.config.set('USER', 'vhost_subdomain_' + str(j), i)
OUT.debug('Storing subdomain name', 8)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 737cfced7f537c73f2666a7389aa23603093150e
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 15:28:28 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:15:21 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=737cfced
WebappConfig/config.py: Fixes spacing issue in --help output.
---
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index c0ea645..1f3fab1 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -389,7 +389,7 @@ class Config:
group = OptionGroup(self.parser, 'APPLICATION VERSION',
'The name and version number of the web appli'
- 'cation to install e.g. phpmyadmin 2.5.4. The'
+ 'cation to install e.g. phpmyadmin 2.5.4. The '
'APPLICATION must have already been installed'
' into the '
+ self.config.get('USER', 'my_approot') +
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:14 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 50a697831e324edc8a2a50d31fa22729f3241e07
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 01:27:15 2013 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:13:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=50a69783
WebappConfig/config.py: Prevents overwriting config variables.
When setting vhost_subdomain_# variables in /etc/vhosts/webapp-config
they have a possibility of being overwritten by the split_hostname()
function. To see this happen you should set vhost_subdomain_1 to a
value and try and use it as a variable in your config file. This will
then get overwritten by your vhost_hostname. This commit will prevent
that from occuring while also having the get() method ignore the
inexistence of a vhost_subdomain_# variable in your config file,
due to the fact that if the variable does exist it will be used, and
if the variable does not exist then it will get overwritten by a
piece of vhost_hostname that is separated by the "." delimiter.
X-Gentoo-Bug: 300250
X-Gentoo-Bug-URL: https://bugs.gentoo.org/300250
X-Gentoo-Bug: 349491
X-Gentoo-Bug-URL: https://bugs.gentoo.org/349491
---
WebappConfig/config.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 9ade0b6..e251ca6 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -75,6 +75,8 @@ class BashConfigParser(configparser_ConfigParser):
'ures.'
if self.error_action == 0:
OUT.die(error)
+ elif self.error_action == 1 and re.search('^vhost_subdomain_\d+', option):
+ pass
elif self.error_action == 1:
OUT.warn(error)
return ''
@@ -994,7 +996,8 @@ class Config:
j = len(subdomains)
for i in subdomains:
- self.config.set('USER', 'vhost_subdomain_' + str(j), i)
+ if not self.config.get('USER', 'vhost_subdomain_' + str(j)):
+ self.config.set('USER', 'vhost_subdomain_' + str(j), i)
OUT.debug('Storing subdomain name', 8)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2014-01-25 3:17 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2014-01-25 3:17 UTC (permalink / raw
To: gentoo-commits
commit: a8e3acd8a1ee4e146870ea748a1b323d33128461
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 03:17:30 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 03:17:30 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=a8e3acd8
Bump to version 1.53
---
WebappConfig/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index 48627a8..45f8758 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -13,7 +13,7 @@
#
# ========================================================================
-WCVERSION = '1.52'
+WCVERSION = '1.53'
if __name__ == '__main__':
print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: a72f0889c57d2bff26078123ca1b6c814c547c21
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 16 19:16:58 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:47:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=a72f0889
config.py: Improves package version checking
With the previous method of setting the package version you were
unable to pass the package version to webapp-config if it had more
than one decimal point (ex: 1.0.1 wouldn't work), this commit attempts
to fix that issue.
WebappConfig/config.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 10a6f26..5eb4584 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -990,11 +990,18 @@ class Config:
else:
OUT.die('Invalid package name')
- try:
- self.config.set('USER', 'pvr', str(float(args[1])))
- except ValueError:
+ argsvr = args[1].split('.')
+ if len(argsvr) == 1:
OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
+ pvr = ''
+ for i in range(0, len(argsvr)):
+ if not i == len(argsvr) - 1:
+ pvr += argsvr[i] + '.'
+ else:
+ pvr += argsvr[i]
+ self.config.set('USER', 'pvr', pvr)
+
# --------------------------------------------------------------------
# Helper functions
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: e61bebefada3a9f61940824e348cb5f25e901911
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 19:26:36 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:47:08 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=e61bebef
config.py: Adds more thorough checking for setting self.work
WebappConfig/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index acf7b7a..99ccedd 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -582,7 +582,7 @@ class Config:
info_opts.add_argument('-li',
'--list-installs',
- action='store_true',
+ nargs = 2,
help = 'List all current virtual installs for <a'
'pplication>. Use * for the package name and/or '
'version number to list more than one package / '
@@ -966,7 +966,7 @@ class Config:
sys.exit()
for i in work:
- if options.get(i):
+ if options.get(i) != None and options.get(i) != False:
self.work = i
break
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 42279c7cd61ddfb9504bb7cb2ee05f65d4f851eb
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 19:30:40 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:47:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=42279c7c
config.py: Modifies --list_unused_installed to nargs = "*"
In order to allow the nature of --list_unused_installed to remain true
to the nature of the command line arg, the nargs has been changed to
"*". This allows --list_unused_installed to be called with 0 or more
args via the argparse python class.
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 99ccedd..10a6f26 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -598,7 +598,7 @@ class Config:
info_opts.add_argument('-lui',
'--list-unused-installs',
- action='store_true',
+ nargs = '*',
help = 'List all master images which currently a'
're not used. Optionally, provide a package and/'
'or version number as arguments to restrict the '
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 440212ff44f2168a93c81bff05479c7a8335fb59
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 19:12:31 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:46:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=440212ff
config.py: Adds "query" to list of actions to get pn and pvr
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 7ea194f..84840bb 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -975,7 +975,7 @@ class Config:
OUT.debug('Checking command line arguments', 1)
- if self.work in ['install', 'clean', 'show_postinst',
+ if self.work in ['install', 'clean', 'query', 'show_postinst',
'show_postupgrade', 'upgrade']:
# get cat / pn
args = options[self.work]
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: dd0b8ce636d7a533c8e2efcfbee905d2de4ff744
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 19:15:27 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:46:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=dd0b8ce6
config.py: Changes --query nargs to 2
WebappConfig/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 84840bb..acf7b7a 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -633,7 +633,7 @@ class Config:
'instructions when they were shown to you ;-)')
info_opts.add_argument('--query',
- action='store_true')
+ nargs=2)
#-----------------------------------------------------------------
# Other Options
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 45afbf20372a5466f5704397944acb5f705402fc
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 02:26:44 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=45afbf20
config.py: Adds optionality to --dir flag
If the --dir flag is not specified with actions that require
the dir flag then webapp-config will default to the name of the
package as the installation directory.
WebappConfig/config.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 06dfc4c..c9c0baf 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -429,8 +429,9 @@ class Config:
'--dir',
nargs = 1,
help = 'Install <application> into DIR under the'
- ' htdocs dir. The default is '
- + self.config.get('USER', 'g_installdir'))
+ ' htdocs dir. Not specifying using this flag'
+ ' will result in defaulting to the package '
+ ' name.')
inst_locs.add_argument('-h',
'--host',
@@ -891,7 +892,6 @@ class Config:
# Map command line options into the configuration
option_to_config = {'host' : 'vhost_hostname',
- 'dir' : 'g_installdir',
'server' : 'vhost_server',
'secure' : 'g_secure',
'user' : 'vhost_config_uid',
@@ -1009,6 +1009,15 @@ class Config:
pvr += argsvr[i]
self.config.set('USER', 'pvr', pvr)
+ if not options['dir'] and self.work != 'list_installs':
+ pn = self.config.get('USER', 'pn')
+ msg = 'Install dir flag not supplied, defaulting to '\
+ '"%(pn)s".' % {'pn': pn}
+
+ OUT.warn(msg)
+ self.config.set('USER', 'g_installdir', pn)
+ self.flag_dir = True
+
# --------------------------------------------------------------------
# Helper functions
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: fe9d834d80fe9c7de334619f4b37469d769558d6
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 00:38:26 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=fe9d834d
config.py: Removes unnecessary .keys() call for option_to_config dict
WebappConfig/config.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 2c14baa..06dfc4c 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -904,15 +904,15 @@ class Config:
'verbose' : 'g_verbose',
'bug_report' : 'g_bugreport'}
- for i in list(option_to_config.keys()):
- if i in options and options[i]:
+ for key in option_to_config:
+ if key in options and options[key]:
# If it's a list, we're expecting only one value in the list.
- if isinstance(options[i], list):
- self.config.set('USER', option_to_config[i],
- str(options[i][0]))
+ if isinstance(options[key], list):
+ self.config.set('USER', option_to_config[key],
+ str(options[key][0]))
else:
- self.config.set('USER', option_to_config[i],
- str(options[i]))
+ self.config.set('USER', option_to_config[key],
+ str(options[key]))
# handle verbosity
if ('pretend' in options
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: eb983fc49914c942d476c62f73e025b1e95c8748
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 03:44:03 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:52:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=eb983fc4
db.py: Reverts OUT.info() call to print() in listinstalls()
WebappConfig/db.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 06d9e04..0fbd34a 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -403,7 +403,7 @@ class WebappDB(AppHierarchy):
OUT.info(' ' + i[3].strip(), 1)
else:
# This is a simplified form for the webapp.eclass
- OUT.info(i[3].strip(), 1)
+ print(i[3].strip())
# ========================================================================
# Handler for /usr/share/webapps
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: f65ecf2f00848079cda820d2de65152b29129033
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 03:54:16 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:52:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=f65ecf2f
config.py: Suppresses warning message for lack of -d flag for --query
WebappConfig/config.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index ab19ee3..cb9d552 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -1013,7 +1013,8 @@ class Config:
pvr += argsvr[i]
self.config.set('USER', 'pvr', pvr)
- if not options['dir'] and self.work != 'list_installs':
+ if (not options['dir'] and
+ self.work not in ('list_installs', 'query')):
pn = self.config.get('USER', 'pn')
msg = 'Install dir flag not supplied, defaulting to '\
'"%(pn)s".' % {'pn': pn}
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 8ac9e0dbf2a8d871887a3b577515662f57874c17
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 02:40:12 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=8ac9e0db
config.py: Allows for -lui to not have any arguments passed
Other command line flags such as -I, -C, or -U will always expect
2 command line args. If they are not properly supplied then that
is handled by argparse. This commit allows for the -lui flag that
can have 0 up to 2 optional flags passed to have that 0 flags passed.
WebappConfig/config.py | 84 ++++++++++++++++++++++++++------------------------
1 file changed, 43 insertions(+), 41 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index c9c0baf..37c2982 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -976,47 +976,49 @@ class Config:
'show_postinst', 'show_postupgrade', 'upgrade']:
# get cat / pn
args = options[self.work]
- m = args[0].split('/')
-
- if self.work == 'list_installs' and len(args) > 2:
- msg = os.path.basename(sys.argv[0]) + ': error: argument -li/'\
- '--list-installs: expected up to 2 arguments'
-
- self.parser.print_usage()
- print(msg)
- sys.exit()
-
- if len(m) == 1:
- if '*' not in m:
- self.config.set('USER', 'pn', m[0])
- elif len(m) == 2:
- self.config.set('USER', 'cat', m[0])
- if '*' not in m:
- self.config.set('USER', 'pn', m[1])
- else:
- OUT.die('Invalid package name')
-
- if len(args) > 1:
- argsvr = args[1].split('.')
- if len(argsvr) == 1:
- OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
-
- pvr = ''
- for i in range(0, len(argsvr)):
- if not i == len(argsvr) - 1:
- pvr += argsvr[i] + '.'
- else:
- pvr += argsvr[i]
- self.config.set('USER', 'pvr', pvr)
-
- if not options['dir'] and self.work != 'list_installs':
- pn = self.config.get('USER', 'pn')
- msg = 'Install dir flag not supplied, defaulting to '\
- '"%(pn)s".' % {'pn': pn}
-
- OUT.warn(msg)
- self.config.set('USER', 'g_installdir', pn)
- self.flag_dir = True
+
+ if len(args):
+ m = args[0].split('/')
+
+ if self.work == 'list_installs' and len(args) > 2:
+ msg = os.path.basename(sys.argv[0]) + ': error: argument '\
+ '-li/--list-installs: expected up to 2 arguments'
+
+ self.parser.print_usage()
+ print(msg)
+ sys.exit()
+
+ if len(m) == 1:
+ if '*' not in m:
+ self.config.set('USER', 'pn', m[0])
+ elif len(m) == 2:
+ self.config.set('USER', 'cat', m[0])
+ if '*' not in m:
+ self.config.set('USER', 'pn', m[1])
+ else:
+ OUT.die('Invalid package name')
+
+ if len(args) > 1:
+ argsvr = args[1].split('.')
+ if len(argsvr) == 1:
+ OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
+
+ pvr = ''
+ for i in range(0, len(argsvr)):
+ if not i == len(argsvr) - 1:
+ pvr += argsvr[i] + '.'
+ else:
+ pvr += argsvr[i]
+ self.config.set('USER', 'pvr', pvr)
+
+ if not options['dir'] and self.work != 'list_installs':
+ pn = self.config.get('USER', 'pn')
+ msg = 'Install dir flag not supplied, defaulting to '\
+ '"%(pn)s".' % {'pn': pn}
+
+ OUT.warn(msg)
+ self.config.set('USER', 'g_installdir', pn)
+ self.flag_dir = True
# --------------------------------------------------------------------
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 04c567f09d9230f65fbe37ccd29789c6d010dec5
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 02:51:31 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=04c567f0
config.py: Message clean ups
WebappConfig/config.py | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 37c2982..8d6a0ae 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -1001,7 +1001,8 @@ class Config:
if len(args) > 1:
argsvr = args[1].split('.')
if len(argsvr) == 1:
- OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
+ OUT.die('Invalid package version: %(pvr)s'
+ % {'pvr': args[1]})
pvr = ''
for i in range(0, len(argsvr)):
@@ -1384,17 +1385,15 @@ class Config:
# upgrade
# okay - what do we have?
-
- OUT.info('Removing '
- + old['WEB_CATEGORY'] + '/'
- + old['WEB_PN'] + '-'
- + old['WEB_PVR'] + ' from '
- + self.installdir() + '\n'
- + ' Installed by '
- + old['WEB_INSTALLEDBY'] + ' on '
- + old['WEB_INSTALLEDDATE'] + '\n'
- +' Config files owned by '
- + old['WEB_INSTALLEDFOR'], 1)
+ msg = 'Removing '
+ if old['WEB_CATEGORY']:
+ msg += old['WEB_CATEGORY'] + '/'
+ msg += old['WEB_PN'] + '-' + old['WEB_PVR'] + ' from '\
+ + self.installdir() + '\n Installed by '\
+ + old['WEB_INSTALLEDBY'] + ' on ' + old['WEB_INSTALLEDDATE']\
+ + '\n Config files owned by ' + old['WEB_INSTALLEDFOR']
+
+ OUT.info(msg, 1)
content = self.create_content(old['WEB_CATEGORY'], old['WEB_PN'], old['WEB_PVR'])
content.read()
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 9f682ae6eaa6b51d38e0d842dd7e65ca7ed89e54
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 03:19:16 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=9f682ae6
config.py: Readds the "dir" key to the option_to_config term
WebappConfig/config.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 8d6a0ae..ab19ee3 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -892,6 +892,7 @@ class Config:
# Map command line options into the configuration
option_to_config = {'host' : 'vhost_hostname',
+ 'dir' : 'g_installdir',
'server' : 'vhost_server',
'secure' : 'g_secure',
'user' : 'vhost_config_uid',
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: dfacbd61aa4c39e6518a018031fcbd9825ee80b8
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 14 01:06:26 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:49:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=dfacbd61
config.py: Modifies import strategy for config parser
On systems which had dev-python/configparser installed (a package
to add support for the py3.x configparser class in py2.x)
webapp-config would make use of that class instead of py2.x's built
in ConfigParser class. This would lead to improper interpolation of
configuration variables that follow the syntax "${<var>}". This
dangerous behavior could (and has) lead to webapp-config installing
a webapp to the root filesystem of a host. This danger has been
avoided by modifying the import strategy for the config parser we're
using so that we force import the ConfigParser class if using py2.x.
X-Gentoo-Bug: 528752
X-Gentoo-Bug-URL: https://bugs.gentoo.org/528752
WebappConfig/config.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index cdae149..c87b93b 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -21,15 +21,12 @@
import sys, os, os.path, re, socket, time
-try:
+if sys.hexversion >= 0x3000000:
# Python 3
import configparser
- if sys.version_info >= (3, 2):
- from configparser import ConfigParser as configparser_ConfigParser
- from configparser import ExtendedInterpolation
- else:
- from configparser import SafeConfigParser as configparser_ConfigParser
-except ImportError:
+ from configparser import ConfigParser as configparser_ConfigParser
+ from configparser import ExtendedInterpolation
+else:
# Python 2
import ConfigParser as configparser
from ConfigParser import SafeConfigParser as configparser_ConfigParser
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 19:52 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 24a6f7413e784513d432451b92fa799980b09b1d
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 02:10:54 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:50:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=24a6f741
{config, db}.py: Adds proper support for list-installs command
The webapp-config man page says that the --list-installs flag
can be the package name, and/or version, or "*". So changes
needed to be made to allow for this functionality.
WebappConfig/config.py | 43 +++++++++++++++++++++++++++----------------
WebappConfig/db.py | 2 +-
2 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index c87b93b..2c14baa 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -579,7 +579,7 @@ class Config:
info_opts.add_argument('-li',
'--list-installs',
- nargs = 2,
+ nargs = '*',
help = 'List all current virtual installs for <a'
'pplication>. Use * for the package name and/or '
'version number to list more than one package / '
@@ -972,32 +972,43 @@ class Config:
OUT.debug('Checking command line arguments', 1)
- if self.work in ['install', 'clean', 'query', 'show_postinst',
- 'show_postupgrade', 'upgrade']:
+ if self.work in ['install', 'clean', 'query', 'list_installs',
+ 'show_postinst', 'show_postupgrade', 'upgrade']:
# get cat / pn
args = options[self.work]
+ m = args[0].split('/')
+
+ if self.work == 'list_installs' and len(args) > 2:
+ msg = os.path.basename(sys.argv[0]) + ': error: argument -li/'\
+ '--list-installs: expected up to 2 arguments'
- m = args[0].split('/')
+ self.parser.print_usage()
+ print(msg)
+ sys.exit()
if len(m) == 1:
- self.config.set('USER', 'pn', m[0])
+ if '*' not in m:
+ self.config.set('USER', 'pn', m[0])
elif len(m) == 2:
self.config.set('USER', 'cat', m[0])
- self.config.set('USER', 'pn', m[1])
+ if '*' not in m:
+ self.config.set('USER', 'pn', m[1])
else:
OUT.die('Invalid package name')
- argsvr = args[1].split('.')
- if len(argsvr) == 1:
- OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
+ if len(args) > 1:
+ argsvr = args[1].split('.')
+ if len(argsvr) == 1:
+ OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]})
+
+ pvr = ''
+ for i in range(0, len(argsvr)):
+ if not i == len(argsvr) - 1:
+ pvr += argsvr[i] + '.'
+ else:
+ pvr += argsvr[i]
+ self.config.set('USER', 'pvr', pvr)
- pvr = ''
- for i in range(0, len(argsvr)):
- if not i == len(argsvr) - 1:
- pvr += argsvr[i] + '.'
- else:
- pvr += argsvr[i]
- self.config.set('USER', 'pvr', pvr)
# --------------------------------------------------------------------
# Helper functions
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 0fbd34a..06d9e04 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -403,7 +403,7 @@ class WebappDB(AppHierarchy):
OUT.info(' ' + i[3].strip(), 1)
else:
# This is a simplified form for the webapp.eclass
- print(i[3].strip())
+ OUT.info(i[3].strip(), 1)
# ========================================================================
# Handler for /usr/share/webapps
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-06-19 22:38 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-06-19 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 831253e2f7554a701570b71bccc6e6b9507120c7
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 22:37:38 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:37:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=831253e2
config.py: Moves setting of g_orig_installdir to allow lack of -d flag
If this is not moved the .webapp file will not have WEB_INSTALLDIR
properly set when running "webapp-config -I <PN> <PVR>" which causes
issues when trying to uninstall the webapp.
WebappConfig/config.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index cb9d552..6c915c3 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -933,10 +933,6 @@ class Config:
OUT.set_info_level(1)
- # store original installdir
- self.config.set('USER', 'g_orig_installdir',
- self.config.get('USER', 'g_installdir'))
-
# Provide simple subdomain support
self.split_hostname()
@@ -1023,6 +1019,10 @@ class Config:
self.config.set('USER', 'g_installdir', pn)
self.flag_dir = True
+ # store original installdir
+ self.config.set('USER', 'g_orig_installdir',
+ self.config.get('USER', 'g_installdir'))
+
# --------------------------------------------------------------------
# Helper functions
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-07-02 16:49 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-07-02 16:49 UTC (permalink / raw
To: gentoo-commits
commit: d4c544a1703e67630aa65a704a946e613ea2081f
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 16:49:00 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 16:49:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=d4c544a1
version.py: Modifies to reflect git version
WebappConfig/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index a795719..f52527b 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -13,7 +13,7 @@
#
# ========================================================================
-WCVERSION = '1.54'
+WCVERSION = '1.54-git'
if __name__ == '__main__':
print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-07-03 4:50 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-07-03 4:50 UTC (permalink / raw
To: gentoo-commits
commit: e5627dab9a94231803ba69fae4720b07b9773506
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 16:49:00 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 04:49:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=e5627dab
version.py: Modifies version to reflect git status
WebappConfig/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index a795719..f52527b 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -13,7 +13,7 @@
#
# ========================================================================
-WCVERSION = '1.54'
+WCVERSION = '1.54-git'
if __name__ == '__main__':
print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2015-07-11 1:27 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2015-07-11 1:27 UTC (permalink / raw
To: gentoo-commits
commit: 9e251c7574d074e424ea19024f743c754f321979
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 01:25:17 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 01:25:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=9e251c75
config.py: Fixes package version checking regression
Previously webapp-config would not do any sanity checks when
setting the package version. After adding a sanity check in 1.54
I made the mistake of not being flexible enough and this caused
a regression that prevented web apps with versions such as
"20140929d"[1] to be installed. This commit fixes that while still
allowing for some sanity checking.
[1]: https://github.com/gentoo/webapp-config/issues/2
WebappConfig/config.py | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 6c915c3..3a176a0 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -996,17 +996,20 @@ class Config:
OUT.die('Invalid package name')
if len(args) > 1:
- argsvr = args[1].split('.')
- if len(argsvr) == 1:
- OUT.die('Invalid package version: %(pvr)s'
+ pvr = args[1]
+ has_int = False # A package version should have at least one
+ # numerical value, but we want to allow for
+ # the flexibility of having any alphanumeric
+ # value while checking to make sure it's sane.
+
+ for char in pvr:
+ if char.isdigit():
+ has_int = True
+
+ if not has_int:
+ OUT.die('Invalid package version: "%(pvr)s"'
% {'pvr': args[1]})
- pvr = ''
- for i in range(0, len(argsvr)):
- if not i == len(argsvr) - 1:
- pvr += argsvr[i] + '.'
- else:
- pvr += argsvr[i]
self.config.set('USER', 'pvr', pvr)
if (not options['dir'] and
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2016-05-12 12:42 Anthony G. Basile
0 siblings, 0 replies; 81+ messages in thread
From: Anthony G. Basile @ 2016-05-12 12:42 UTC (permalink / raw
To: gentoo-commits
commit: 4db4c535273734541352bde38b658e09a20d1c22
Author: Paolo Pedroni <PPed72 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue May 3 09:15:27 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 12 12:38:45 2016 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=4db4c535
ebuild.py: fix bashism
X-Gentoo-Bug: 561798
X-Gentoo-Bug-URL: https://bugs.gentoo.org/561798
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
WebappConfig/ebuild.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
index fecbe44..b10fe9f 100644
--- a/WebappConfig/ebuild.py
+++ b/WebappConfig/ebuild.py
@@ -101,7 +101,7 @@ class Ebuild:
for i in post_instructions:
i = i.replace('"', '\\"')
- post.append(os.popen('echo -n "' + i + '"\n').read()[:-1])
+ post.append(os.popen('printf "' + i + '"\n').read()[:-1])
post = post + [
'',
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2017-02-16 3:09 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2017-02-16 3:09 UTC (permalink / raw
To: gentoo-commits
commit: af52e7cfec44828b3722f484f3ed4c0ee4fd22d8
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 03:02:44 2017 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 03:03:45 2017 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=af52e7cf
server.py: Uses EPREFIX variable
X-Gentoo-Bug: 608018
X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
WebappConfig/server.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index ec9c141..4c3b571 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -22,6 +22,7 @@
import os, os.path
from WebappConfig.debug import OUT
+from WebappConfig.eprefix import EPREFIX
from WebappConfig.worker import WebappRemove, WebappAdd
from WebappConfig.permissions import get_group, get_user
@@ -195,7 +196,7 @@ class Basic:
dir = self.__destd
dirs = []
- while dir != '/':
+ while dir != EPREFIX + '/':
dirs.insert(0, dir)
dir = os.path.dirname(dir)
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2017-02-16 3:09 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2017-02-16 3:09 UTC (permalink / raw
To: gentoo-commits
commit: 192ab96f59acd4f7ddc634a49e9077f8c8aeda94
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 02:48:03 2017 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 03:03:14 2017 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=192ab96f
config.py: Uses EPREFIX variable
X-Gentoo-Bug: 608018
X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
WebappConfig/config.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 3a176a0..2c11d39 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -37,10 +37,12 @@ import WebappConfig.wrapper as wrapper
from argparse import ArgumentParser
from WebappConfig.debug import OUT
+from WebappConfig.eprefix import EPREFIX
from WebappConfig.version import WCVERSION
from WebappConfig.permissions import PermissionMap
+
# ========================================================================
# BashParser class
# ------------------------------------------------------------------------
@@ -223,14 +225,14 @@ class Config:
self.__d = {
'config_protect' : '',
# Necessary to load the config file
- 'my_etcconfig' : '/etc/vhosts/webapp-config',
+ 'my_etcconfig' : EPREFIX + '/etc/vhosts/webapp-config',
'my_dotconfig' : '.webapp',
'my_version' : WCVERSION,
'my_conf_version' : '7',
'my_bugsurl' : wrapper.bugs_link,
'g_myname' : sys.argv[0],
- 'g_orig_installdir' : '/',
- 'g_installdir' : '/',
+ 'g_orig_installdir' : EPREFIX + '/',
+ 'g_installdir' : EPREFIX + '/',
'g_link_options' : '',
'g_link_type' : 'hard',
'g_configprefix' : '._cfg',
@@ -265,9 +267,9 @@ class Config:
# -- wrobel
'vhost_server_uid' : 'root',
'vhost_server_gid' : 'root',
- 'my_persistroot' : '/var/db/webapps',
+ 'my_persistroot' : EPREFIX + '/var/db/webapps',
'wa_installsbase' : 'installs',
- 'vhost_root' : '/var/www/${vhost_hostname}',
+ 'vhost_root' : EPREFIX + '/var/www/${vhost_hostname}',
'g_htdocsdir' : '${vhost_root}/${my_htdocsbase}',
'my_appdir' : '${my_approot}/${my_appsuffix}',
'my_htdocsdir' : '${my_appdir}/htdocs',
@@ -277,7 +279,7 @@ class Config:
'my_iconsdir' : '${my_hostrootdir}/${my_iconsbase}',
'my_errorsdir' : '${my_hostrootdir}/${my_errorsbase}',
'g_cgibindir' : '${vhost_root}/${my_cgibinbase}',
- 'my_approot' : '/usr/share/webapps',
+ 'my_approot' : EPREFIX + '/usr/share/webapps',
'package_manager' : 'portage',
'allow_absolute' : 'no',
'my_hostrootbase' : 'hostroot',
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2017-02-16 3:09 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2017-02-16 3:09 UTC (permalink / raw
To: gentoo-commits
commit: e9b6ef7e44c9bd9c940b60854490a894617fb3ed
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 02:46:55 2017 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 02:47:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=e9b6ef7e
eprefix.py: Adds EPREFIX variable to import in other places
X-Gentoo-Bug: 608018
X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
WebappConfig/eprefix.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/WebappConfig/eprefix.py b/WebappConfig/eprefix.py
new file mode 100644
index 0000000..7d5bd66
--- /dev/null
+++ b/WebappConfig/eprefix.py
@@ -0,0 +1,6 @@
+# Establish the eprefix, initially set so eprefixify can
+# set it on install
+EPREFIX = "@GENTOO_PORTAGE_EPREFIX@"
+# Check and set it if it wasn't
+if "GENTOO_PORTAGE_EPREFIX" in EPREFIX:
+ EPREFIX = ''
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2017-02-16 3:09 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2017-02-16 3:09 UTC (permalink / raw
To: gentoo-commits
commit: 62e968d5456f773042d66456c4f87334c3d48709
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 02:48:17 2017 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 03:03:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=62e968d5
db.py: Uses EPREFIX variable
X-Gentoo-Bug: 608018
X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018
WebappConfig/db.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index 0fbd34a..698c49a 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -26,6 +26,7 @@ import time, os, os.path, re
import WebappConfig.wrapper as wrapper
from WebappConfig.debug import OUT
+from WebappConfig.eprefix import EPREFIX
from WebappConfig.permissions import PermissionMap
@@ -166,7 +167,7 @@ class WebappDB(AppHierarchy):
def __init__(self,
fs_root = '/',
- root = '/var/db/webapps',
+ root = EPREFIX + '/var/db/webapps',
category = '',
package = '',
version = '',
@@ -416,8 +417,8 @@ class WebappSource(AppHierarchy):
'''
def __init__(self,
- fs_root = '/',
- root = '/usr/share/webapps',
+ fs_root = EPREFIX + '/',
+ root = EPREFIX + '/usr/share/webapps',
category = '',
package = '',
version = '',
^ permalink raw reply related [flat|nested] 81+ messages in thread
* [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
@ 2017-06-22 23:04 Devan Franchini
0 siblings, 0 replies; 81+ messages in thread
From: Devan Franchini @ 2017-06-22 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 55b6d681dd3df9954094a5fc3732c391e9544036
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 23:01:12 2017 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 23:04:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=55b6d681
version.py: Updates version number
WebappConfig/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index f52527b..e41cb0c 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -13,7 +13,7 @@
#
# ========================================================================
-WCVERSION = '1.54-git'
+WCVERSION = '1.55-git'
if __name__ == '__main__':
print(WCVERSION)
^ permalink raw reply related [flat|nested] 81+ messages in thread
end of thread, other threads:[~2017-06-22 23:04 UTC | newest]
Thread overview: 81+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-12 12:42 [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-06-22 23:04 Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2015-07-11 1:27 Devan Franchini
2015-07-03 4:50 Devan Franchini
2015-07-02 16:49 Devan Franchini
2015-06-19 22:38 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2014-01-25 3:17 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-02 1:47 Devan Franchini
2014-01-01 1:09 Devan Franchini
2013-10-29 19:13 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:18 Devan Franchini
2013-10-29 2:18 Devan Franchini
2013-10-29 2:15 Devan Franchini
2013-10-10 0:35 Devan Franchini
2013-09-26 4:03 Devan Franchini
2013-09-26 3:44 Devan Franchini
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-08-06 12:28 Anthony G. Basile
2013-08-06 11:00 Anthony G. Basile
2013-08-06 11:00 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-04-22 0:52 Anthony G. Basile
2013-03-23 4:05 Anthony G. Basile
2013-03-14 2:19 Anthony G. Basile
2013-03-09 13:45 Anthony G. Basile
2013-02-12 3:40 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2011-12-30 17:52 Anthony G. Basile
2011-12-30 17:50 Anthony G. Basile
2011-12-30 17:34 Anthony G. Basile
2011-12-30 17:23 Anthony G. Basile
2011-12-30 17:11 Anthony G. Basile
2011-12-30 16:50 Anthony G. Basile
2011-12-30 16:42 Anthony G. Basile
2011-08-06 1:51 Anthony G. Basile
2011-06-14 15:23 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox