Changeset 198 for trunk

Timestamp:

11/09/05 18:15:40 (19 years ago)

Author:

Nicholas Riley

Message:

LocationDo.py: ssh to yt in 4111; 1320 AP works for 1310/1320

action.py: fix killall on vpnc to actually work

props: ignore build, dist directories

Location:

trunk/LocationDo

Files:

• . (modified) (1 prop)
• LocationDo.py (modified) (3 diffs)
• action.py (modified) (1 diff)

trunk/LocationDo

@@ -1 +1 @@
 brightness
 *.pyc
+build
+dist

@@ -1 +1 @@
 brightness
 *.pyc
+build
+dist

trunk/LocationDo/LocationDo.py

@@ -70 +70 @@
     if '4111 SC' in location:
         action.openInBackground('~/Documents/MSSP/MSSP progress.oo3')
+        action.terminalDo('kswitch -p njriley@ACM.UIUC.EDU;(sleep 10;kswitch -p njriley@AD.UIUC.EDU)&!;clear;ssh yt')
         action.setDisplayBrightnessPercent(0.9)
         action.setAdiumStatus('Working in 4111 SC')
@@ -80 +81 @@
         action.setVolumePercent(0.5)
         action.setAdiumStatus('At home')
-    if '1320 DCL' in location:
+    if '13[12]0 DCL' in location:
         action.setDisplayBrightnessPercent(0.2)
         action.setVolumePercent(0)
-        action.setAdiumStatus('In 1320 DCL')
+        action.setAdiumStatus('In 13[12]0 DCL')
     if 'UIUCnet' in location:
         action.startVPNC('UIUCnet-oncampus')
@@ -140 +141 @@
                         location.add('Champaign')
                     elif bssid == '00:13:c4:ce:66:a0':
-                        location.add('1320 DCL')
+                        location.add('13[12]0 DCL')
                     elif bssid in ['00:14:1c:ad:5c:80', '00:14:1c:ad:64:50']:
                         location.add('MEB')

trunk/LocationDo/action.py

@@ -72 +72 @@
 
 def stopVPNC():
-    authorizationDo('/usr/bin/killall', 'vpnc')
+    # killall uses your uid, not your euid to determine which user's
+    # processes to kill; without '-u root', this fails
+    authorizationDo('/usr/bin/killall', '-u', 'root', 'vpnc')
 
 def startVPNC(vpncProfile=None):

@@ -1 +1 @@
 brightness
 *.pyc
+build
+dist