Date: Mon, 5 Dec 2016 00:22:42 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427825 - in head/net-mgmt/observium: . files Message-ID: <201612050022.uB50Mgcg084802@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Dec 5 00:22:42 2016 New Revision: 427825 URL: https://svnweb.freebsd.org/changeset/ports/427825 Log: net-mgmt/observium: Fix poller-wrapper.py It was attempting to set PATH before importing os module Reported by: Adrian Murphy <amurphy [AT] gsoft com au> Modified: head/net-mgmt/observium/Makefile head/net-mgmt/observium/files/patch-poller-wrapper.py Modified: head/net-mgmt/observium/Makefile ============================================================================== --- head/net-mgmt/observium/Makefile Mon Dec 5 00:16:34 2016 (r427824) +++ head/net-mgmt/observium/Makefile Mon Dec 5 00:22:42 2016 (r427825) @@ -3,7 +3,7 @@ PORTNAME= observium PORTVERSION= 0.16.10.8128 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest Modified: head/net-mgmt/observium/files/patch-poller-wrapper.py ============================================================================== --- head/net-mgmt/observium/files/patch-poller-wrapper.py Mon Dec 5 00:16:34 2016 (r427824) +++ head/net-mgmt/observium/files/patch-poller-wrapper.py Mon Dec 5 00:22:42 2016 (r427825) @@ -1,11 +1,18 @@ ---- poller-wrapper.py.orig 2014-11-04 16:14:27 UTC +--- poller-wrapper.py.orig 2016-12-05 00:19:29 UTC +++ poller-wrapper.py -@@ -38,6 +38,8 @@ except: - print "threading, Queue, sys, subprocess, time, os, json" +@@ -45,6 +45,8 @@ except: + print("threading, sys, subprocess, time, os, json") sys.exit(2) +os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin' + - try: - import MySQLdb - except: + # start time + s_time = time.time() + +@@ -608,4 +610,4 @@ db.close() + # Return exit code + sys.exit(exit_code) + +-# EOF +\ No newline at end of file ++# EOF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612050022.uB50Mgcg084802>