summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2006-10-18 11:29:06 -0400
committerJim Meyering <jim@meyering.net>2006-10-18 11:29:06 -0400
commit4f3a2a94785ca94a67d27bc2b26a997b86d1eda3 (patch)
tree3ccf34473b20298ebd209c0528183f8901ece9c4
parentd9e7a0bb7dfe1c8cadb16383285d040c92fa113f (diff)
downloadthird_party-cobbler-4f3a2a94785ca94a67d27bc2b26a997b86d1eda3.tar.gz
third_party-cobbler-4f3a2a94785ca94a67d27bc2b26a997b86d1eda3.tar.xz
third_party-cobbler-4f3a2a94785ca94a67d27bc2b26a997b86d1eda3.zip
Trailing whitespace.
-rw-r--r--cobbler.pod2
-rw-r--r--cobbler/action_enchant.py2
-rw-r--r--cobbler/action_import.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/cobbler.pod b/cobbler.pod
index 4111f90..946b28d 100644
--- a/cobbler.pod
+++ b/cobbler.pod
@@ -266,7 +266,7 @@ The dhcpd.conf file will be updated each time "cobbler sync" is run.
While the normal provisioning procedure is either to PXE bare-metal, or use koan to do something else (kickstart an existing system or deploy Xen), cobbler contains yet another option, called "enchant".
-Enchant takes a configuration that has already been defined (be sure to run "cobbler sync" before using "cobbler enchant") and applies it to a remote system that may not have koan installed.
+Enchant takes a configuration that has already been defined (be sure to run "cobbler sync" before using "cobbler enchant") and applies it to a remote system that may not have koan installed.
Running "enchant" will replace the operating system of the target machine, so use it with caution.
diff --git a/cobbler/action_enchant.py b/cobbler/action_enchant.py
index e343e69..b0ca495 100644
--- a/cobbler/action_enchant.py
+++ b/cobbler/action_enchant.py
@@ -23,7 +23,7 @@ class Enchant:
def __init__(self,config,address,profile,system):
"""
- Constructor.
+ Constructor.
config: a configuration reference (see api module)
sysname: address of system to enchant (not necc. defined in cobbler)
profile: profile to make the system become
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 5c64fe1..7c40645 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -55,7 +55,7 @@ DIRECTORY_SIEVE = [
"ftp-isos", "compat-layer", "compat-layer-tree",
"SRPMS", "headers", "dosutils", "Publishers",
"LIVE", "RedHat", "image-template", "logs",
- "EMEA", "APAC", "isolinux",
+ "EMEA", "APAC", "isolinux",
"debug", "repodata", "repoview", "Fedora",
"stylesheet-images", "buildinstall", "partner", "noarch",
"src-isos", "dvd-isos", "docs", "misc"