Trailing whitespace.

14 files changed, 50 insertions, 50 deletions

diff --git a/CHANGELOG b/CHANGELOG
index cc452d6..6cd3784 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,12 +27,12 @@ Cobbler CHANGELOG
 - dhcpd.conf MAC & hostname association features
 
 * Thu Sep 21 2006 - 0.1.1-8
-- (RPM) Added doc files to %doc, removed INSTALLED_FILES 
+- (RPM) Added doc files to %doc, removed INSTALLED_FILES
 
 * Wed Sep 20 2006 - 0.1.1-7
 - Split HTTP and TFTP content to seperate directories
   to enable running in SELinux targetted/enforcing mode.
-- Make the Xen MAC address a property of a system, not a profile 
+- Make the Xen MAC address a property of a system, not a profile
 - Misc. fixes, mainly along the error path
 
 * Fri Sep 15 2006 - 0.1.1-6
diff --git a/TODO b/TODO
index d4e1f5e..4ddbc22 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@ cobbler TODO list
 
 need to fix:
   -  turn on locking in production
-  -  For "enchant", try to verify that syslinux and mkinitrd are installed on the remote.    
+  -  For "enchant", try to verify that syslinux and mkinitrd are installed on the remote.
   -  "enchant" would be better if it didn't need to know the password
   -  "enchant" has issues with ssh key changes locking it out
   -  "enchant" should be written in a more distro-agnostic way.
@@ -17,12 +17,12 @@ making things more standardized/flexible:
      and make the multiple-bootloader system more plugin oriented to allow
      for alternative bootloaders (not neccessarily kickstart related)
      to be added
-  -  look into what it would take to make kickstart *more optional* 
+  -  look into what it would take to make kickstart *more optional*
 
 bells and whistles:
   -  Wake on lan integration for PXE
   -  Integration with stonnith or other up/down devices?
-   
+
 internal code cleanup:
   -  an argument parsing overhaul is probably due
   -  remove the cobbler_msg logic since i18n isn't likely
diff --git a/cobbler.pod b/cobbler.pod
index 61824cd..b98e730 100644
--- a/cobbler.pod
+++ b/cobbler.pod
@@ -10,9 +10,9 @@ cobbler command [subcommand] [--arg1=] [--arg2=]
 
 Cobbler manages provisioning using a tiered concept of Distributions, Profiles, and Systems.
 
-Distributions contain information about what kernel and initrd are used, along with various other information, such as required kernel parameters.  
+Distributions contain information about what kernel and initrd are used, along with various other information, such as required kernel parameters.
 
-Profiles associate a Distribution with a kickstart file and optionally customize it further.  
+Profiles associate a Distribution with a kickstart file and optionally customize it further.
 
 Systems associate a hostname, IP, or MAC with a distribution and optionally customize the Profile further.
 
@@ -22,11 +22,11 @@ Systems associate a hostname, IP, or MAC with a distribution and optionally cust
 
 Running "cobbler check" after installation will verify that the prerequisites are installed and configured correctly.
 
-Any problems detected should be corrected, with the potential exception of DHCP related warnings.  
+Any problems detected should be corrected, with the potential exception of DHCP related warnings.
 
 It is especially important that the server name be accurate in cobbler.conf
 
-For PXE, if DHCP is run from the cobbler server, the dhcp configuration file should be changed as suggested.  If DHCP is not run locally, the "next-server" field on the DHCP server should point to the cobbler server's IP and the filename should be set to "pxelinux.0".   
+For PXE, if DHCP is run from the cobbler server, the dhcp configuration file should be changed as suggested.  If DHCP is not run locally, the "next-server" field on the DHCP server should point to the cobbler server's IP and the filename should be set to "pxelinux.0".
 
 =head2 ADDING A DISTRIBUTION
 
@@ -66,7 +66,7 @@ ia64 uses the IA64 build of elilo.
 
 (optional)
 
-This is an advanced feature that sets kickstart variables to substitute, thus enabling kickstart files to be treated as templates.  
+This is an advanced feature that sets kickstart variables to substitute, thus enabling kickstart files to be treated as templates.
 
 Example: --ksmeta="foo=bar baz=3 asdf"
 
@@ -135,7 +135,7 @@ Advanced feature.
 If cobbler is configured to generate the dhcpd.conf file, use this
 setting to pin a certain hostname or IP to a given MAC address.  This corresponds to the "fixed-address" field in dhcpd.conf.
 
-When using this setting for IA64 machines, be sure that the "--name" given to the "system add" command is a MAC address or no per-system record in dhcpd.conf can be generated. 
+When using this setting for IA64 machines, be sure that the "--name" given to the "system add" command is a MAC address or no per-system record in dhcpd.conf can be generated.
 
 Example: ---pxe-address=192.168.1.50
 
@@ -147,7 +147,7 @@ NOTE: Due to a limitation in elilo (IA64 bootloader), this parameter must ALSO b
 
 B<cobbler list>
 
-Prints the current cobbler configuration for systems, profiles, and groups.  
+Prints the current cobbler configuration for systems, profiles, and groups.
 
 =head2 DELETING CONFIGURATION ENTRIES
 
@@ -162,7 +162,7 @@ B<cobbler system remove --name=<string>>
 B<cobbler sync [--dryrun]>
 
 Configurations are saved in /var/lib/cobbler.  Changes made with any commands are not
-applied until 'cobbler sync' is run.   Any errors in the configuration will be reported 
+applied until 'cobbler sync' is run.   Any errors in the configuration will be reported
 during the sync process.
 
 =head1 EXAMPLES
@@ -215,7 +215,7 @@ To apply these changes, "cobbler sync" must be run to generate custom kickstarts
 
 For NFS and HTTP URLs, the "--ksmeta" options will have no effect. This is a good reason to let
 cobbler manage your kickstart files, though the URL functionality is provided for integration with
-legacy infrastructure, possibly including web apps that already generate kickstarts. 
+legacy infrastructure, possibly including web apps that already generate kickstarts.
 
 =head2 DHCP CONFIGURATION MANAGEMENT
 
@@ -237,7 +237,7 @@ The dhcpd.conf file will be updated each time "cobbler sync" is run.
 
 =head2 ENCHANT
 
-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".  
+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 system 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.  This is all done from the cobbler server using SSH.  The remote system will reboot prior to configuring the bootloader to kickstart.
 
@@ -249,11 +249,11 @@ Usage:  B<cobbler system enchant --name=<ip|hostname> [--password=<string>]>
 
 Cobbler can auto-add distributions and profiles from remote sources, whether this is an NFS path or an rsync mirror.  This can save a lot of time when setting up a new provisioning environment.
 
-NOTE: The mirror or directory tree must have the basic directory tree layout as a Fedora or Centos mirror normally looks, including directories named things like "pxeboot" or "xen", "i386" or "x86_64", and so forth.  
+NOTE: The mirror or directory tree must have the basic directory tree layout as a Fedora or Centos mirror normally looks, including directories named things like "pxeboot" or "xen", "i386" or "x86_64", and so forth.
 
 When importing a rsync mirror, cobbler can try to detect the distribution type and automatically assign kickstarts.  This autodetection is rather primative but can improve as community users contribute kickstarts.  If cobbler is able to guess the architecture, it will provision the system by erasing the hard drive, setting up eth0 for dhcp, and using a default password of "cobbler".  If this is undesirable, edit the kickstart files in /etc/cobbler to do something else or change the kickstart setting after cobbler creates the profile.
 
-If a mirror updated with rsync changes, running the "update.sh" script created in /var/www/cobbler/localmirror/<mirrorname> will update the files and the cobbler metadata appropriately.  
+If a mirror updated with rsync changes, running the "update.sh" script created in /var/www/cobbler/localmirror/<mirrorname> will update the files and the cobbler metadata appropriately.
 
 Usage: B<cobbler import --path=<path>>
 
diff --git a/cobbler/action_enchant.py b/cobbler/action_enchant.py
index 03ad987..fed102a 100644
--- a/cobbler/action_enchant.py
+++ b/cobbler/action_enchant.py
@@ -34,7 +34,7 @@ class Enchant:
            raise cexception.CobblerException("enchant_failed","no system name specified")
        self.profile = ''
        self.password = password
- 
+
    def call(self,cmd):
        """
        Invoke something over SSH.
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 109a49c..0f9c46c 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -29,7 +29,7 @@ import api
 # for FC5 is sent everywhere.  That probably WON'T work in most
 # places even though it's a minimalistic kickstart.  This will
 # get patched over time.
-MATCH_LIST = ( 
+MATCH_LIST = (
    ( "1/"       , "/etc/cobbler/kickstart_fc5.ks" ),
    ( "2/"       , "/etc/cobbler/kickstart_fc5.ks" ),
    ( "3/"       , "/etc/cobbler/kickstart_fc5.ks" ),
@@ -94,7 +94,7 @@ class Importer:
        second: remove any profiles that depend on distros that don't exist
        systems will be left as orphans as the MAC info may be useful
        to the sysadmin and may not be recorded elsewhere.  We will report
-       the orphaned systems.  
+       the orphaned systems.
        FIXME: this should also be a seperate API command!
        """
        print "*** SCRUBBING ORPHANS"
@@ -134,14 +134,14 @@ class Importer:
            kpath = distro.kernel
            if not kpath.startswith("/var/www/cobbler"):
                print "*** CAN'T GUESS (kpath): %s" % kpath
-               continue 
+               continue
            for entry in MATCH_LIST:
                (part, kickstart) = entry
                if kpath.find(part) != -1:
                    print "*** CONSIDERING: %s" % kickstart
                    if os.path.exists(kickstart):
                        print "*** ASSIGNING kickstart: %s" % kickstart
-                       profile.set_kickstart(kickstart)      
+                       profile.set_kickstart(kickstart)
                        # from the kernel path, the tree path is always two up.
                        # FIXME: that's probably not always true
                        dirname = os.path.dirname(kpath)
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 4fda5b3..d18dc71 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -72,7 +72,7 @@ class BootSync:
                if retcode != 0:
                    print >>sys.stderr, "Warning: dhcpd restart failed"
             except OSError, e:
-               print >>sys.stderr, "Warning: dhcpd restart failed: ", e 
+               print >>sys.stderr, "Warning: dhcpd restart failed: ", e
         return True
 
     def copy_koan(self):
@@ -89,7 +89,7 @@ class BootSync:
         """
         Copy bootloaders to the configured tftpboot directory
         NOTE: we support different arch's if defined in
-        /var/lib/cobbler/settings. 
+        /var/lib/cobbler/settings.
         """
         for loader in self.settings.bootloaders.keys():
             path = self.settings.bootloaders[loader]
@@ -110,8 +110,8 @@ class BootSync:
         f1 = self.open_file("/etc/dhcpd.conf","w+")
         template_data = f2.read()
         f2.close()
-       
-        # build each per-system definition 
+
+        # build each per-system definition
         system_definitions = ""
         counter = 0
         elilo = os.path.basename(self.settings.bootloaders["ia64"])
@@ -124,7 +124,7 @@ class BootSync:
                 # the MAC as the system name.
                 continue
             systxt = ""
-            counter = counter + 1            
+            counter = counter + 1
             systxt = "\nhost label%d {\n" % counter
             profile = self.profiles.find(system.profile)
             distro  = self.distros.find(profile.distro)
@@ -179,7 +179,7 @@ class BootSync:
     def clean_trees(self):
         """
         Delete any previously built pxelinux.cfg tree and xen tree info.
-  
+
         Note: for SELinux reasons, some information goes in /tftpboot, some in /var/www/cobbler
         and some must be duplicated in both.  This is because PXE needs tftp, and auto-kickstart
         and Xen operations need http.   Only the kernel and initrd images are duplicated, which is
@@ -346,7 +346,7 @@ class BootSync:
         Usually it's just one or the other.
 
         """
-    
+
         self.sync_log(cobbler_msg.lookup("sync_buildtree"))
         self.write_listings()
 
@@ -390,7 +390,7 @@ class BootSync:
             f1 = self.get_pxe_filename(system.name)
 
             # tftp only
-            
+
 
             if distro.arch in [ "x86", "x86_64", "standard"]:
                 # pxelinux wants a file named $name under pxelinux.cfg
@@ -401,10 +401,10 @@ class BootSync:
                 if system.pxe_address == "" or system.pxe_address is None or not utils.is_ip(system.pxe_address):
                     raise cexceptions.CobblerException("exc_ia64_noip",system.name)
 
-                
-                filename = "%s.conf" % self.get_pxe_filename(system.pxe_address) 
+
+                filename = "%s.conf" % self.get_pxe_filename(system.pxe_address)
                 f2 = os.path.join(self.settings.tftpboot, filename)
-               
+
             f3 = os.path.join(self.settings.webdir, "systems", f1)
 
             if distro.arch in [ "x86", "x86_64", "standard"]:
@@ -461,7 +461,7 @@ class BootSync:
             self.tee(fd,"\tinitrd=%s\n" % initrd_path)
             self.tee(fd,"\tread-only\n")
             self.tee(fd,"\troot=/dev/ram\n")
-        
+
         # now build the kernel command line
         kopts = self.blend_options(True,(
            self.settings.kernel_options,
@@ -477,7 +477,7 @@ class BootSync:
         # for ia64, it's already done
         if not is_ia64:
             append_line = "%s initrd=%s" % (append_line,initrd_path)
-       
+
         # kickstart path (if kickstart is used)
         if kickstart_path is not None and kickstart_path != "":
             # if kickstart path is on disk, we've already copied it into
@@ -600,7 +600,7 @@ class BootSync:
            return shutil.copy(src,dst)
        except IOError, ioe:
            raise cexceptions.CobblerException("need_perms2",src,dst)
-   
+
     def rmfile(self,path):
        """
        For dryrun support.  potentially unlink a file.
diff --git a/cobbler/api.py b/cobbler/api.py
index fae5d64..bc95a29 100644
--- a/cobbler/api.py
+++ b/cobbler/api.py
@@ -111,7 +111,7 @@ class BootAPI:
     def enchant(self,sysname,password):
         """
         Apply a system profile to a running remote system, replacing
-        the current OS.  
+        the current OS.
         """
         enchant = action_enchant.Enchant(self._config,sysname,password)
         return enchant.run()
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py
index d31924c..6ce5661 100755
--- a/cobbler/cobbler.py
+++ b/cobbler/cobbler.py
@@ -125,7 +125,7 @@ class BootCLI:
 
     def system_enchant(self,args):
         """
-        Reinstall a system:  
+        Reinstall a system:
         'cobbler system enchant --name='foo' [--password='foo']
         """
         self.temp_password = ''
diff --git a/cobbler/cobbler_msg.py b/cobbler/cobbler_msg.py
index dee3611..5f9ea91 100644
--- a/cobbler/cobbler_msg.py
+++ b/cobbler/cobbler_msg.py
@@ -82,7 +82,7 @@ _msg_table = {
   "exc_profile2"    : "profile name not set",
   "exc_pxe_arch"    : "valid PXE architectures: standard or ia64",
   "exc_no_template" : "can't read /etc/cobbler/dhcp.template",
-  "exc_dhcp_nomac"  : "when cobbler is managing dhcpd.conf, all system names must be MAC addresses.  Aborting.", 
+  "exc_dhcp_nomac"  : "when cobbler is managing dhcpd.conf, all system names must be MAC addresses.  Aborting.",
   "exc_ia64_noip"   : "due to an IA64 bootloader limitation, system (%s) must define a pxe-address value (which is an IP address)",
   "lock"            : "Locked.  If cobbler is currently running, wait for termination, otherwise remove /var/lib/cobbler/lock",
   "check_ok"        : """
diff --git a/cobbler/item_distro.py b/cobbler/item_distro.py
index 9af47f4..2c85790 100644
--- a/cobbler/item_distro.py
+++ b/cobbler/item_distro.py
@@ -81,10 +81,10 @@ class Distro(item.Item):
 
         Should someone have Itanium machines on a network, having
         syslinux (pxelinux.0) be the only option in the config file causes
-        problems.  
+        problems.
 
-        Using an alternative distro type allows for dhcpd.conf templating 
-        to "do the right thing" with those systems -- this also relates to 
+        Using an alternative distro type allows for dhcpd.conf templating
+        to "do the right thing" with those systems -- this also relates to
         bootloader configuration files which have different syntax for different
         distro types (because of the bootloaders).
 
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 74ea7c7..8a5c604 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -56,10 +56,10 @@ class System(item.Item):
         # restricting to address as IP only in dhcpd.conf is probably
         # incorrect ... some people may want to pin the hostname instead.
         # doing so, however, doesn't allow dhcpd.conf to be managed
-        # by cobbler (since elilo can't do MAC addresses) -- this is 
+        # by cobbler (since elilo can't do MAC addresses) -- this is
         # covered in the man page.
         if not utils.is_ip(address) and not utils.is_mac(address):
-            raise cexceptions.CobblerException("bad_ip")    
+            raise cexceptions.CobblerException("bad_ip")
         self.pxe_address = address
         return True
 
diff --git a/elilo-3.6-ia64.efi b/elilo-3.6-ia64.efi
index 3880d59..de0df83 100644
--- a/elilo-3.6-ia64.efi
+++ b/elilo-3.6-ia64.efi
diff --git a/kickstart_fc5.ks b/kickstart_fc5.ks
index fe43386..0ee46dd 100644
--- a/kickstart_fc5.ks
+++ b/kickstart_fc5.ks
@@ -1,14 +1,14 @@
 #platform=x86, AMD64, or Intel EM64T
 # System authorization information
-auth  --useshadow  --enablemd5 
+auth  --useshadow  --enablemd5
 # System bootloader configuration
 bootloader --location=mbr
 # Partition clearing information
-clearpart --all --initlabel 
+clearpart --all --initlabel
 # Use text mode install
 text
 # Firewall configuration
-firewall --enabled   
+firewall --enabled
 # Run the Setup Agent on first boot
 firstboot --disable
 # System keyboard
diff --git a/tests/tests.py b/tests/tests.py
index 8acc1a7..4911303 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -312,7 +312,7 @@ class TestImport(BootTest):
           "import_testdata_RHEL-4_U4_AS_x86_64_tree_images_pxeboot" : [0, 1, "x86_64" ],
           "import_testdata_core_5_i386_os_images_pxeboot" : [ 0, 1, "x86" ],
           "import_testdata_core_5_i386_os_images_xen" : [0, 1, "x86" ],
-       }       
+       }
 
        # first go through all found distros and count the matches
        for distro in self.api.distros():
@@ -326,12 +326,12 @@ class TestImport(BootTest):
                    got_it = True
            if not got_it: # hasn't :)
                self.fail("imported foreign distro: %s" % distro.name)
-           
+
        # now check the required number of matches vs actual.
        # this checks to ensure unsupported arches aren't imported and there
        # are no duplicate imports
        for match in haystacks.keys():
-           found = haystacks[match] 
+           found = haystacks[match]
            self.failUnlessEqual(found[0], found[1], "mismatched counts: %d vs %d for %s" % (found[0], found[1], match))
 
 if __name__ == "__main__":