summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-19 18:30:49 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-19 18:30:49 -0400
commita7db44fab1b5418921b9d57574f588d416724699 (patch)
tree885b3150cf26f0af0cf6297d736503b5c1936d73
parent59fcf7bc502d250ea9cec8d9f9b0d2e3233d95e9 (diff)
downloadthird_party-cobbler-a7db44fab1b5418921b9d57574f588d416724699.zip
third_party-cobbler-a7db44fab1b5418921b9d57574f588d416724699.tar.gz
third_party-cobbler-a7db44fab1b5418921b9d57574f588d416724699.tar.xz
Package the cobbler manpage as html as well as a docs page. Fix a broken docstring in action_sync.py
-rw-r--r--MANIFEST.in2
-rw-r--r--cobbler.spec2
-rw-r--r--cobbler/action_sync.py2
-rw-r--r--cobbler/webui/master.py4
-rw-r--r--docs/wui.html2
-rw-r--r--setup.py4
6 files changed, 11 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 1160d2f..88752e2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -13,6 +13,8 @@ include config/settings
recursive-include templates *.template
recursive-include kickstarts *.ks
include docs/cobbler.1.gz
+include docs/cobbler.html
+include docs/wui.html
include COPYING AUTHORS README CHANGELOG
include scripts/watcher.py
include scripts/cobblerd
diff --git a/cobbler.spec b/cobbler.spec
index 96ce8c4..388d5aa 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -103,7 +103,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%defattr(444,apache,apache)
/var/www/cobbler/webui/*.css
/var/www/cobbler/webui/*.png
-
+/var/www/cobbler/webui/*.html
%defattr(-,root,root)
%dir /tftpboot/pxelinux.cfg
%dir /tftpboot/images
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 69f66b6..9cd7b46 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -357,7 +357,7 @@ class BootSync:
* signal the status watcher we're done
* disable PXE if needed
* save the original kickstart file for debug
- ""
+ """
# FIXME: watcher is more of a request than a packaged file
# we should eventually package something and let it do something important"
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 7fc1d6a..b29bb8c 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
currentTime=time.time
__CHEETAH_version__ = '2.0rc8'
__CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1190239979.666712
-__CHEETAH_genTimestamp__ = 'Wed Sep 19 18:12:59 2007'
+__CHEETAH_genTime__ = 1190241010.2348001
+__CHEETAH_genTimestamp__ = 'Wed Sep 19 18:30:10 2007'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Tue Sep 18 15:11:43 2007'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
diff --git a/docs/wui.html b/docs/wui.html
new file mode 100644
index 0000000..0a8ec8f
--- /dev/null
+++ b/docs/wui.html
@@ -0,0 +1,2 @@
+...
+
diff --git a/setup.py b/setup.py
index 9e2b1b2..9aaccdc 100644
--- a/setup.py
+++ b/setup.py
@@ -148,7 +148,9 @@ if __name__ == "__main__":
(wwwtmpl, ['webui_templates/ksfile_view.tmpl']),
# Web UI support files
- (wwwgfx, []),
+ (wwwgfx, ['docs/wui.html']),
+ (wwwgfx, ['docs/cobbler.html']),
+ (wwwgfx, []),
(wwwgfx, ['webui_content/icon-tip.png']),
(wwwgfx, ['webui_content/style.css']),
(wwwgfx, ['webui_content/logo-cobbler.png']),