← Back to branch summary

~gandelman-a/ubuntu/precise/cobbler/cobbler-ubuntu-import-proxy

« back to all changes in this revision

Viewing changes to cobbler/config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Clint Byrum, Robie Basak
  • Date: 2011-11-15 12:35:40 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20111115123540-5g139uuhg7z0hv5d
Tags: 2.2.2-0ubuntu1
https://launchpad.net/bugs/858860
https://launchpad.net/bugs/863738
https://launchpad.net/bugs/858875
https://launchpad.net/bugs/863755
https://launchpad.net/bugs/858883
[Chuck Short]
* New upstream release:
  + Use dh_python2 everywhere.
  + Folded debian/patches/49_ubuntu_add_arm_arch_support.patch
    and debian/patches/56_ubuntu_arm_generate_pxe_files.patch
    into one patch for easier upstreaming.
  + Dropped debian/patches/50_fix_cobbler_timezone.patch:
    Fix upstream.
  + Dropped debian/patches/47_ubuntu_add_oneiric_codename.patch
    in favor of debian/patches/47_ubuntu_add_codenames.patch:
    It adds "precise" and drops unsupported releases as well.
  + Dropped debian/patches/41_update_tree_path_with_arch.patch:
    No longer needed.
  + Dropped debian/patches/55_ubuntu_branding.patch: Will be moved
    to orchestra

 [Clint Byrum]
 * debian/cobbler.postinst: create users.digest mode 0600 so it
   is not world readable. (LP: #858860)
 * debian/control: cobbler needs to depend on python-cobbler
   (LP: #863738)
 * debian/patches/58_fix_egg_cache.patch: Do not point dangerous
   PYTHON_EGG_CACHE at world writable directory. (LP: #858875)
 * debian/cobbler-common.install: remove users.digest as it is
   not required and contains a known password that would leave
   cobblerd vulnerable if started before configuration is done
 * debian/cobbler-web.postinst: fix perms on webui_sessions to
   be more secure (LP: #863755)

 [Robie Basak]
 * Backport safe YAML load from upstream. (LP: #858883)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cobbler/config.py
249
249
       """
250
250
       Load the object hierachy from disk, using the filenames referenced in each object.
251
251
       """
252
 
       try:
253
 
           serializer.deserialize(self._settings)
254
 
       except:
255
 
           traceback.print_exc()
256
 
           raise CX("/etc/cobbler/settings is not a valid YAML file")
257
 
       serializer.deserialize(self._distros)
258
 
       serializer.deserialize(self._repos)
259
 
       serializer.deserialize(self._profiles)
260
 
       serializer.deserialize(self._images)
261
 
       serializer.deserialize(self._systems)
262
 
       serializer.deserialize(self._mgmtclasses)
263
 
       serializer.deserialize(self._packages)
264
 
       serializer.deserialize(self._files)
 
252
       for item in [
 
253
           self._settings,
 
254
           self._distros,
 
255
           self._repos,
 
256
           self._profiles,
 
257
           self._images,
 
258
           self._systems,
 
259
           self._mgmtclasses,
 
260
           self._packages,
 
261
           self._files,
 
262
           ]:
 
263
           try:
 
264
               if not serializer.deserialize(item): raise ""
 
265
           except:
 
266
               raise CX("serializer: error loading collection %s. Check /etc/cobbler/modules.conf" % item.collection_type())
265
267
       return True
266
268
 
267
269
   def deserialize_raw(self,collection_type):