diff options
| author | feld <feld@FreeBSD.org> | 2016-12-05 08:22:42 +0800 |
|---|---|---|
| committer | feld <feld@FreeBSD.org> | 2016-12-05 08:22:42 +0800 |
| commit | 5cd9d42f4d1817438e73e4aba12ed16c839c49e7 (patch) | |
| tree | 843a9ae25147f89ad74cfb8a422bb8fcb905b045 /net-mgmt | |
| parent | eec025fef448b8c0325e2be9ae25a089bb06e175 (diff) | |
| download | freebsd-ports-gnome-5cd9d42f4d1817438e73e4aba12ed16c839c49e7.tar.gz freebsd-ports-gnome-5cd9d42f4d1817438e73e4aba12ed16c839c49e7.tar.zst freebsd-ports-gnome-5cd9d42f4d1817438e73e4aba12ed16c839c49e7.zip | |
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>
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/observium/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/observium/files/patch-poller-wrapper.py | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index b04d1de85bd8..fcfd77f974ba 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -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 diff --git a/net-mgmt/observium/files/patch-poller-wrapper.py b/net-mgmt/observium/files/patch-poller-wrapper.py index ba11a1203e8e..013cd2be67f7 100644 --- a/net-mgmt/observium/files/patch-poller-wrapper.py +++ b/net-mgmt/observium/files/patch-poller-wrapper.py @@ -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 |