| 1 |
commit: f55ff6ec821d0f7aa6f097aa40867d3d59537013 |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 1 01:03:45 2014 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 1 01:03:45 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=f55ff6ec |
| 7 |
|
| 8 |
WebappConfig/ebuild.py: Alters doctest output to default values. |
| 9 |
|
| 10 |
On line 232 on ebuild.py the testing of the documentation was failing |
| 11 |
due to not returning full variables and instead returning a varaible |
| 12 |
along with "..." in the place of any part of a variable that can change. |
| 13 |
The placement of the "..." was causing the doctest to fail upon emerge. |
| 14 |
|
| 15 |
X-Gentoo-Bug: 430010 |
| 16 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010 |
| 17 |
|
| 18 |
--- |
| 19 |
WebappConfig/ebuild.py | 36 ++++++++++++++++++------------------ |
| 20 |
1 file changed, 18 insertions(+), 18 deletions(-) |
| 21 |
|
| 22 |
diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py |
| 23 |
index 03c0c57..363d144 100644 |
| 24 |
--- a/WebappConfig/ebuild.py |
| 25 |
+++ b/WebappConfig/ebuild.py |
| 26 |
@@ -235,27 +235,27 @@ class Ebuild: |
| 27 |
POST-INSTALL INSTRUCTIONS |
| 28 |
================================================================= |
| 29 |
<BLANKLINE> |
| 30 |
- MY_HOSTROOTDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot |
| 31 |
- MY_HTDOCSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/htdocs |
| 32 |
- MY_CGIBINDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/cgi-bin |
| 33 |
+ MY_HOSTROOTDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/hostroot |
| 34 |
+ MY_HTDOCSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/htdocs |
| 35 |
+ 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 |
| 36 |
MY_INSTALLDIR: / |
| 37 |
- MY_ICONSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/icons |
| 38 |
- MY_SERVERCONFIGDIR: .../tests/testfiles/share-webapps/horde/3.0.5/conf |
| 39 |
- MY_ERRORSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/hostroot/error |
| 40 |
- MY_SQLSCRIPTSDIR: .../tests/testfiles/share-webapps/horde/3.0.5/sqlscripts |
| 41 |
- VHOST_ROOT: /var/www/... |
| 42 |
- VHOST_HTDOCSDIR: /var/www/.../htdocs |
| 43 |
- VHOST_CGIBINDIR: /var/www/.../cgi-bin |
| 44 |
- VHOST_CONFDIR: /var/www/.../ |
| 45 |
- VHOST_ERRORSDIR: /var/www/.../error |
| 46 |
- VHOST_ICONSDIR: /var/www/.../icons |
| 47 |
- VHOST_HOSTNAME: ... |
| 48 |
+ 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 |
| 49 |
+ MY_SERVERCONFIGDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/conf |
| 50 |
+ 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 |
| 51 |
+ MY_SQLSCRIPTSDIR: /var/tmp/portage/app-admin/webapp-config-9999/work/webapp-config-9999/WebappConfig/tests/testfiles/share-webapps/horde/3.0.5/sqlscripts |
| 52 |
+ VHOST_ROOT: /var/www/66-152-109-110.tvc-ip.com |
| 53 |
+ VHOST_HTDOCSDIR: /var/www/66-152-109-110.tvc-ip.com/htdocs |
| 54 |
+ VHOST_CGIBINDIR: /var/www/66-152-109-110.tvc-ip.com/cgi-bin |
| 55 |
+ VHOST_CONFDIR: /var/www/66-152-109-110.tvc-ip.com/conf |
| 56 |
+ VHOST_ERRORSDIR: /var/www/66-152-109-110.tvc-ip.com/error |
| 57 |
+ VHOST_ICONSDIR: /var/www/66-152-109-110.tvc-ip.com/icons |
| 58 |
+ VHOST_HOSTNAME: 66-152-109-110.tvc-ip.com |
| 59 |
VHOST_SERVER: apache |
| 60 |
VHOST_APPDIR: / |
| 61 |
- VHOST_CONFIG_UID: ... |
| 62 |
- VHOST_CONFIG_GID: ... |
| 63 |
- VHOST_SERVER_UID: ... |
| 64 |
- VHOST_SERVER_GID: ... |
| 65 |
+ VHOST_CONFIG_UID: 250 |
| 66 |
+ VHOST_CONFIG_GID: 250 |
| 67 |
+ VHOST_SERVER_UID: root |
| 68 |
+ VHOST_SERVER_GID: root |
| 69 |
VHOST_DEFAULT_UID: 0 |
| 70 |
VHOST_DEFAULT_GID: 0 |
| 71 |
VHOST_PERMS_SERVEROWNED_DIR: 0775 |
Archives