[Rivet-svn] r2530 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Jun 25 20:38:58 2010
New Revision: 2530

Log:
Fixing a couple of import/path problems found yesterday by David Grellscheid

Modified:
   trunk/ChangeLog
   trunk/bin/compare-histos
   trunk/bin/rivet-buildplugin

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Jun 25 11:33:35 2010	(r2529)
+++ trunk/ChangeLog	Fri Jun 25 20:38:58 2010	(r2530)
@@ -1,3 +1,8 @@
+2010-06-24  Andy Buckley  <andy at insectnation.org>
+
+	* Making rivet-buildplugin look in its own bin directory when
+	trying to find rivet-config.
+
 2010-06-23  Andy Buckley  <andy at insectnation.org>
 
 	* Adding protection and warning about numerical precision issues

Modified: trunk/bin/compare-histos
==============================================================================
--- trunk/bin/compare-histos	Fri Jun 25 11:33:35 2010	(r2529)
+++ trunk/bin/compare-histos	Fri Jun 25 20:38:58 2010	(r2530)
@@ -56,6 +56,9 @@
 if __name__ == "__main__":
     import os, sys, re, logging
 
+    PROGPATH = sys.argv[0]
+    PROGNAME = os.path.basename(PROGPATH)
+
     ## Try to rename the process on Linux
     try:
        import ctypes
@@ -81,8 +84,10 @@
                 rivet_data_dirs = os.environ.get("RIVET_REF_PATH").split(":")
         else:
             rivet_data_dirs.append(rivet.getRivetDataPath())
-    except:
-        pass
+    except Exception, e:
+        sys.stderr.write(PROGNAME + " requires the 'rivet' Python module\n");
+        logging.debug(str(e))
+        sys.exit(1)
 
     ## Parse command line options
     from optparse import OptionParser

Modified: trunk/bin/rivet-buildplugin
==============================================================================
--- trunk/bin/rivet-buildplugin	Fri Jun 25 11:33:35 2010	(r2529)
+++ trunk/bin/rivet-buildplugin	Fri Jun 25 20:38:58 2010	(r2530)
@@ -44,7 +44,7 @@
 sources="$@"
 
 ## Get Rivet include flags
-RIVETCONFIG=$(PATH="$PATH:." which rivet-config)
+RIVETCONFIG=$(PATH="`dirname $0`:$PATH:." which rivet-config)
 cppflags=$($RIVETCONFIG --cppflags)
 
 ## Build