Browse Source

Agent: move processCheck code block

master
Pekka Helenius 4 years ago
parent
commit
827a3e4993
1 changed files with 17 additions and 17 deletions
  1. +17
    -17
      tools/pamusb-agent

+ 17
- 17
tools/pamusb-agent View File

@ -33,23 +33,6 @@ from gi.repository import GLib, UDisks
import xml.etree.ElementTree as et 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: class HotPlugDevice:
def __init__(self, serial): def __init__(self, serial):
self.__udi = None self.__udi = None
@ -275,6 +258,23 @@ udisksObjectManager = udisks.get_object_manager()
sysUsers= [] sysUsers= []
validUsers = [] 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: try:
with open('/etc/passwd', 'r') as f: with open('/etc/passwd', 'r') as f:
for line in f.readlines(): for line in f.readlines():


Loading…
Cancel
Save