gitso Commit Details

Date:

2010-02-21 20:07:03 (15 years 2 months ago)

Author:

gerberad

Branch:

master

Commit:

a69817538ddb74e3112e7e90ecdfff1f63c8cbb9

Parents:

e14e6703711a7f460d538188df6d97af40263cd1

Message:

/trunk/Processes.py Removed the black background. May include in future optimizations.

/trunk/GitsoThread.py
Changed how we check to see if vnc process is running.

Changes:

File differences

-124
125 125
126 126
127 
127
128 128
129 
129
130 130
131 131
132 132
+␉␉listen = []␊
␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉if self.host <> "":␊
␉␉␉␉connection = os.popen('netstat -an | grep 5500 | grep ESTABLISHED').readlines()␊
␉␉␉␉connection = os.popen('LANG=C netstat -an | grep 5500 | grep ESTABLISHED').readlines()␊
␉␉␉else:␊
␉␉␉␉listen = os.popen('netstat -an | grep 5500 | grep LISTEN').readlines()␊
␉␉␉␉listen = os.popen('LANG=C netstat -an | grep 5500 | grep LISTEN').readlines()␊
␉␉elif sys.platform == 'win32':␊
␉␉␉#XP PRO only -- Need to fix the case where there is no process, it'll still return 1 line.␊
␉␉␉#info = os.popen('WMIC PROCESS ' + str(self.pid) + ' get Processid').readlines()␊
 ␉␉listen = []␊
 ␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
 ␉␉␉if self.host <> "":␊
-␉␉␉␉connection = os.popen('netstat -an | grep 5500 | grep ESTABLISHED').readlines()␊
+␉␉␉␉connection = os.popen('LANG=C netstat -an | grep 5500 | grep ESTABLISHED').readlines()␊
 ␉␉␉else:␊
-␉␉␉␉listen = os.popen('netstat -an | grep 5500 | grep LISTEN').readlines()␊
+␉␉␉␉listen = os.popen('LANG=C netstat -an | grep 5500 | grep LISTEN').readlines()␊
 ␉␉elif sys.platform == 'win32':␊
 ␉␉␉#XP PRO only -- Need to fix the case where there is no process, it'll still return 1 line.␊
 ␉␉␉#info = os.popen('WMIC PROCESS ' + str(self.pid) + ' get Processid').readlines()␊

-36
37 37
38 38
39 
39
40
41
42
40 43
41 44
42 45
+␉␉if sys.platform == 'darwin':␊
␉␉␉self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '-connectHost', '%s' % host)␊
␉␉elif sys.platform.find('linux') != -1:␊
␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
␉␉␉# We should include future versions with options for speed.␊
␉␉␉#self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
␉␉␉␊
␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-connect','%s' % host)␊
␉␉elif sys.platform == 'win32':␊
␉␉␉import subprocess␊
                        self.returnPID = subprocess.Popen(['WinVNC.exe'])␊
 ␉␉if sys.platform == 'darwin':␊
 ␉␉␉self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '-connectHost', '%s' % host)␊
 ␉␉elif sys.platform.find('linux') != -1:␊
-␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
+␉␉␉# We should include future versions with options for speed.␊
+␉␉␉#self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
+␉␉␉␊
+␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-connect','%s' % host)␊
 ␉␉elif sys.platform == 'win32':␊
 ␉␉␉import subprocess␊
                         self.returnPID = subprocess.Popen(['WinVNC.exe'])␊

Download the corresponding diff file

gitso

File differences

Branches