diff options
| author |   Gunnar Wrobel <wrobel@gentoo.org> | 2007-04-27 20:25:25 +0000 |
|---|---|---|
| committer | Gunnar Wrobel <wrobel@gentoo.org> | 2007-04-27 20:25:25 +0000 |
| commit | 7d2327b42aaad683c874f91228bb1b5116af62e3 (patch) | |
| tree | 4187fb5de6a857da9bd0f20a9ef5a8ef0a5a6274 /WebappConfig/content.py | |
| parent | Another fix for the sandbox support and wrapper fixes. (diff) | |
| download | webapp-config-7d2327b42aaad683c874f91228bb1b5116af62e3.tar.gz webapp-config-7d2327b42aaad683c874f91228bb1b5116af62e3.tar.bz2 webapp-config-7d2327b42aaad683c874f91228bb1b5116af62e3.zip | |
Category support and a root fix.
svn path=/trunk/webapp-config/; revision=30
Diffstat (limited to 'WebappConfig/content.py')
| -rw-r--r-- | WebappConfig/content.py | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/WebappConfig/content.py b/WebappConfig/content.py index dc55d16..0549622 100644 --- a/WebappConfig/content.py +++ b/WebappConfig/content.py @@ -6,12 +6,12 @@ # # Originally written for the Gentoo Linux distribution # -# Copyright (c) 1999-2006 Gentoo Foundation +# Copyright (c) 1999-2007 Authors # Released under v2 of the GNU GPL # -# Author(s) Stuart Herbert <stuart@gentoo.org> +# Author(s) Stuart Herbert # Renat Lumpau <rl03@gentoo.org> -# Gunnar Wrobel <php@gunnarwrobel.de> +# Gunnar Wrobel <wrobel@gentoo.org> # # ======================================================================== ''' This class handles the contents file of a virtual install @@ -42,20 +42,23 @@ class Contents: #self.worker.get_config('g_perms_dotconfig') def __init__(self, installdir, + category = '', package = '', version = '', permission = PermissionMap('0600'), dbfile = '.webapp', verbose = False, - pretend = False): + pretend = False, + root = ''): - self.__root = wrapper.get_root() + self.__root = root self.__re = re.compile('/+') self.__installdir = installdir + self.__cat = category self.__pn = package self.__pvr = version - self.__dbfile = dbfile + self.__dbfile = dbfile self.__perm = permission self.__v = verbose @@ -72,7 +75,15 @@ class Contents: def package_name(self): ''' Return the package name for the virtual install.''' - return self.__pn + '-' + self.__pvr + if self.__cat: + # use _ instead of / because we don't want to create a directory + return self.__cat + '_' + self.__pn + '-' + self.__pvr + else: + return self.__pn + '-' + self.__pvr + + def set_category(self, cat): + ''' Set category name.''' + self.__cat = cat def set_package(self, package): ''' Set the package name.''' |