[med-svn] r12201 - in trunk/packages/rcsb-core-wrapper/trunk/debian: . patches

[Laszlo Kajan]

Author: lkajan-guest
Date: 2012-09-12 11:59:48 +0000 (Wed, 12 Sep 2012)
New Revision: 12201

Added:
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log
Modified:
   trunk/packages/rcsb-core-wrapper/trunk/debian/changelog
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
Log:
Patched upstream to not try to remove "/dev/null" log file.

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/changelog
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/changelog	2012-09-12 11:52:45 UTC (rev 12200)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/changelog	2012-09-12 11:59:48 UTC (rev 12201)
@@ -1,6 +1,7 @@
 librcsb-core-wrapper (1.000-2) UNRELEASED; urgency=low
 
   * Corrected to install rcsb/ dir into -dev package instead of include/ dir.
+  * Patched upstream to not try to remove "/dev/null" log file.
 
  -- Laszlo Kajan <lkajan at rostlab.org>  Mon, 03 Sep 2012 17:17:17 +0200
 

Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log	                        (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log	2012-09-12 11:59:48 UTC (rev 12201)
@@ -0,0 +1,24 @@
+--- a/cif-parser/include/CifParserBase.h
++++ b/cif-parser/include/CifParserBase.h
+@@ -73,7 +73,9 @@
+         **  \param[in] fileName - relative or absolute name of the CIF file
+         **    that is to be parsed.
+         **  \param[in] parseLogFileName - relative or absolute name of the file
+-        **    where parsing log is to be stored.
++        **    where parsing log is to be stored. Defaults to
++	**    "<input-file>-parser.log" if left empty.
++	**    Use "/dev/null" to disable logging.
+         **  \param[out] diagnostics - parsing result. If empty, parsing
+         **    completed with no warnings or errors. If non-empty, there were
+         **    parsing warnings and/or parsing errors.
+--- a/cif-parser/src/CifParserBase.C
++++ b/cif-parser/src/CifParserBase.C
+@@ -148,7 +148,7 @@
+     if (RcsbFile::IsEmpty(log))
+     {
+         log.close();
+-        RcsbFile::Delete(logFileName);
++        if( logFileName != "/dev/null" ) RcsbFile::Delete(logFileName);
+     }
+     else
+     {

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2012-09-12 11:52:45 UTC (rev 12200)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2012-09-12 11:59:48 UTC (rev 12201)
@@ -3,6 +3,7 @@
 bash
 make_pair
 unistd
+devnull-log
 docs
 objectfiles
 parallel-build