Merge remote branch 'upstream/maint'

* upstream/maint: (59 commits)
  Client/Tools/APT: fix pylint errors, enable check
  Client/Tools/APT: fix exception name
  SYSV: add a migration tool to change simplename attributes to simplefile
  doc: Update SYSV datastream format docs
  SYSV: change instances of simplename to simplefile
  Client/Tools/APT: handle exceptions gracefully
  Server/Plugins/Packages: add debsrc attribute to url_map
  schemas/packages.xsd: add default value for debsrc
  Options.py: Fix database OPTIONS parsing
  doc: Fix typos
  doc: Add note about Decisions fix for 1.3.6
  testsuite: Fix tools __init__.py unit test
  Tools: Fix install of non-whitelisted services
  doc: Add 1.3.6 release notes
  fix keyboard interrupt during intial event handling
  Server/Core: also shutdown on exceptions during fam blocking
  Reporting: better exception handling
  Packages: add name to additional_data for Sources
  Packages: add name to sources
  YUM: Add options to enable and disable Yum plugins
  ...

Conflicts:
	debian/changelog
	doc/conf.py
	doc/releases/index.txt
	doc/server/database.txt
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/sslca.txt
	man/bcfg2.conf.5
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	schemas/packages.xsd
	solaris-ips/MANIFEST.bcfg2-server.header
	solaris-ips/MANIFEST.bcfg2.header
	solaris-ips/Makefile
	solaris-ips/pkginfo.bcfg2
	solaris-ips/pkginfo.bcfg2-server
	solaris/Makefile
	solaris/pkginfo.bcfg2
	solaris/pkginfo.bcfg2-server
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Client/Tools/APT.py
	src/lib/Bcfg2/Client/Tools/Action.py
	src/lib/Bcfg2/Client/Tools/SYSV.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/templates/base.html
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/settings.py
	src/lib/Bcfg2/version.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index 406216861..96226c424 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -168,7 +168,7 @@ class DjangoORM(StorageBase):
         # TODO - vcs output
         act_dict['detail_type'] = PathEntry.DETAIL_UNUSED
         if path_type == 'directory' and entry.get('prune', 'false') == 'true':
-            unpruned_elist = [e.get('path') for e in entry.findall('Prune')]
+            unpruned_elist = [e.get('name') for e in entry.findall('Prune')]
             if unpruned_elist:
                 act_dict['detail_type'] = PathEntry.DETAIL_PRUNED
                 act_dict['details'] = "\n".join(unpruned_elist)
@@ -367,10 +367,11 @@ class DjangoORM(StorageBase):
     def import_interaction(self, interaction):
         """Import the data into the backend"""
         try:
-            self._import_interaction(interaction)
-        except:
-            self.logger.error("Failed to import interaction: %s" %
-                    traceback.format_exc().splitlines()[-1])
+            try:
+                self._import_interaction(interaction)
+            except:
+                self.logger.error("Failed to import interaction: %s" %
+                        traceback.format_exc().splitlines()[-1])
         finally:
             self.logger.debug("%s: Closing database connection" %
                               self.__class__.__name__)