From 827a3e499347ef9f643914453bfc3c293b5220e8 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Fri, 22 May 2020 09:10:03 +0300
Subject: [PATCH] Agent: move processCheck code block

---
 tools/pamusb-agent | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/pamusb-agent b/tools/pamusb-agent
index ea2e3d6..4d256de 100755
--- a/tools/pamusb-agent
+++ b/tools/pamusb-agent
@@ -33,23 +33,6 @@ from gi.repository import GLib, UDisks
 
 import xml.etree.ElementTree as et
 
-def processCheck():
-
-	global filelock
-	filelock=open(os.path.realpath(__file__),'r')
-
-	try:
-		fcntl.flock(filelock,fcntl.LOCK_EX|fcntl.LOCK_NB)
-	except:
-		print('Process is already running.')
-		sys.exit(1)
-
-	if os.getuid() != 0:
-		print('Process must be run as root.')
-		sys.exit(1)
-
-processCheck()
-
 class HotPlugDevice:
 	def __init__(self, serial):
 		self.__udi = None
@@ -275,6 +258,23 @@ udisksObjectManager = udisks.get_object_manager()
 sysUsers= []
 validUsers = []
 
+def processCheck():
+
+	global filelock
+	filelock=open(os.path.realpath(__file__),'r')
+
+	try:
+		fcntl.flock(filelock,fcntl.LOCK_EX|fcntl.LOCK_NB)
+	except:
+		logger.error('Process is already running.')
+		sys.exit(1)
+
+	if os.getuid() != 0:
+		logger.error('Process must be run as root.')
+		sys.exit(1)
+
+processCheck()
+
 try:
 	with open('/etc/passwd', 'r') as f:
 		for line in f.readlines():