From owner-svn-ports-head@freebsd.org  Mon Dec  5 00:22:43 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5BF5C67AA1;
 Mon,  5 Dec 2016 00:22:43 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A52451E1E;
 Mon,  5 Dec 2016 00:22:43 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB50Mgb7084804;
 Mon, 5 Dec 2016 00:22:42 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB50Mgcg084802;
 Mon, 5 Dec 2016 00:22:42 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201612050022.uB50Mgcg084802@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 5 Dec 2016 00:22:42 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Dec 2016 00:22:43 -0000

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