[dss-commits] digitalSTROM Server branch, master, updated. f55600a7f790a99c205b33312e2aac9b52eeb08d

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  f55600a7f790a99c205b33312e2aac9b52eeb08d (commit)
       via  3bc2ff5950d48126d07538f8a36744bb50feb772 (commit)
      from  5943b88c9a1a7960e506563345bcce64d8821020 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f55600a7f790a99c205b33312e2aac9b52eeb08d
Author: Johannes Winkelmann <johannes.winkelmann at aizo.com>
Date:   Tue Jan 12 09:14:17 2010 +0100

    Handle case where there's no apartment.xml
    
    Previously, we aborted with an Poco::XML::SAXParseException if no
    apartment.xml was found. Now, log an error and continue.

commit 3bc2ff5950d48126d07538f8a36744bb50feb772
Author: Johannes Winkelmann <johannes.winkelmann at aizo.com>
Date:   Tue Jan 12 09:08:38 2010 +0100

    Update debian package files

-----------------------------------------------------------------------

Changes:
diff --git a/core/model/modelpersistence.cpp b/core/model/modelpersistence.cpp
index 4a5b0e8..cecdea4 100644
--- a/core/model/modelpersistence.cpp
+++ b/core/model/modelpersistence.cpp
@@ -33,6 +33,7 @@
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/XML/XMLWriter.h>
 #include <Poco/SAX/InputSource.h>
+#include <Poco/SAX/SAXException.h>
 
 #include "core/foreach.h"
 #include "core/base.h"
@@ -71,7 +72,18 @@ namespace dss {
 
     InputSource input(inFile);
     DOMParser parser;
-    AutoPtr<Document> pDoc = parser.parse(&input);
+    AutoPtr<Document> pDoc;
+    try {
+      pDoc = parser.parse(&input);
+    } catch (Poco::XML::SAXParseException& spe) {
+      // Note that we can hit this case both if it's invalid XML and
+      // when the file doesn't exist at all
+      Logger::getInstance()->log(std::string("ModelPersistence::readConfigurationFromXML: "
+                                             "Parse error in Model configuration: ") + 
+                                 _fileName + ": " + spe.message(), lsError);
+      return;
+    }
+
     Element* rootNode = pDoc->documentElement();
 
     if(rootNode->localName() == "config") {
diff --git a/debian/changelog b/debian/changelog
index f131c91..2c26921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dss (0.7.5) unstable; urgency=low
+
+  * Update to dss 0.7.5
+
+ -- Johannes Winkelmann <johannes.winkelmann at aizo.com>  Thu, 17 Sep 2009 17:06:07 +0200
+
 dss (0.5-dev-1) unstable; urgency=low
 
   * Initial release
diff --git a/debian/rules b/debian/rules
index 4be4ff4..e2794aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,11 +76,19 @@ binary-arch: install
 	dh_fixperms
 #	dh_perl
 #	dh_makeshlibs
+
+
+# 	fix permissions
+	chgrp dialout debian/dss/usr/share/dss/data
+	chmod g+w debian/dss/usr/share/dss/data
+
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 


hooks/post-receive
-- 
digitalSTROM Server