- tor-commits - lists.torproject.org

r25204: {website} revert erinn's makefile clobber from r25202 (website/trunk)
by Roger Dingledine 12 Nov '11

12 Nov '11

Author: arma Date: 2011-11-12 21:23:58 +0000 (Sat, 12 Nov 2011) New Revision: 25204 Modified: website/trunk/Makefile Log: revert erinn's makefile clobber from r25202 Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-11-12 10:23:19 UTC (rev 25203) +++ website/trunk/Makefile 2011-11-12 21:23:58 UTC (rev 25204) @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/Users/erinn/src/tor.git/.git -export STABLETAG=tor-0.2.2.24-alpha -export DEVTAG=tor-0.2.2.24-alpha +export TORGIT=/home/runa/tordev/tor/.git +export STABLETAG=tor-0.2.2.34 +export DEVTAG=tor-0.2.3.7-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[orbot/master] updated strings; modified iptables clear behavior;
by n8fr8＠torproject.org 12 Nov '11

12 Nov '11

commit 8e199a3e9cedf6d4bbca912bd9c7ddab06ba8835 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Nov 12 11:56:16 2011 -0500 updated strings; modified iptables clear behavior; --- res/values/strings.xml | 16 ++ src/org/torproject/android/service/TorService.java | 203 ++++++++++---------- 2 files changed, 119 insertions(+), 100 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a060d55..e465e20 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -183,5 +183,21 @@ <string name="pref_proxy_port_title">Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> +<string name="status">Status</string> +<string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> +<string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> +<string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> +<string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> +<string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> +<string name="transproxy_rules_cleared">TransProxy rules cleared</string> +<string name="couldn_t_start_tor_process_">"Couldn't start Tor process: "</string> +<string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> +<string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> +<string name="bridge_error">Bridge Error</string> +<string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> +<string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> +<string name="error">Error</string> +<string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> +<string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> </resources> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index c4b7b1f..23396c3 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -275,7 +275,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification (getString(R.string.status_disabled),NOTIFY_ID,R.drawable.tornotificationoff); sendCallbackStatusMessage(getString(R.string.status_disabled)); - setupTransProxy(false); + clearTransparentProxy(); } catch (Exception e) { @@ -495,7 +495,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - setupTransProxy(true); + enableTransparentProxy(); runTorShellCmd(); runPrivoxyShellCmd(); @@ -513,20 +513,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean setupTransProxy (boolean activate) throws Exception + private boolean enableTransparentProxy () throws Exception { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); + boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); - if (!hasRoot) - { - - } - else if (activate) + if (hasRoot && enableTransparentProxy) { - boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); boolean transProxyAll = prefs.getBoolean("pref_transparent_all", false); boolean transProxyPortFallback = prefs.getBoolean("pref_transparent_port_fallback", false); boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); @@ -535,83 +531,92 @@ public class TorService extends Service implements TorServiceConstants, TorConst String portProxyList = prefs.getString("pref_port_list", ""); - if (enableTransparentProxy) - { - //TODO: Find a nice place for the next (commented) line - //TorTransProxy.setDNSProxying(); + + //TODO: Find a nice place for the next (commented) line + //TorTransProxy.setDNSProxying(); + + int code = 0; // Default state is "okay" - int code = 0; // Default state is "okay" - - if(transProxyPortFallback) - { - showAlert("Status", "Setting up port-based transparent proxying..."); - StringTokenizer st = new StringTokenizer(portProxyList, ","); - int status = code; - while (st.hasMoreTokens()) - { - status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); - if(status != 0) - code = status; - } - } - else + if(transProxyPortFallback) + { + showAlert(getString(R.string.status), getString(R.string.setting_up_port_based_transparent_proxying_)); + StringTokenizer st = new StringTokenizer(portProxyList, ","); + int status = code; + while (st.hasMoreTokens()) { - if(transProxyAll) - { - showAlert("Status", "Setting up full transparent proxying..."); - code = TorTransProxy.setTransparentProxyingAll(this); - } - else - { - showAlert("Status", "Setting up app-based transparent proxying..."); - code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); - } - + status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); + if(status != 0) + code = status; } - - TorService.logMessage ("TorTransProxy resp code: " + code); - - if (code == 0) + } + else + { + if(transProxyAll) { - showAlert("Status", "Transparent proxying ENABLED"); - - - - if (transProxyTethering) - { - showAlert("Status", "TransProxy enabled for Tethering!"); - - TorTransProxy.enableTetheringRules(this); - - // mBinder.updateConfiguration("TransListenAddress", "0.0.0.0", false); - // mBinder.updateConfiguration("DNSListenAddress", "0.0.0.0", false); - - } + showAlert(getString(R.string.status), getString(R.string.setting_up_full_transparent_proxying_)); + code = TorTransProxy.setTransparentProxyingAll(this); } else { - showAlert("Status", "WARNING: error starting transparent proxying!"); + showAlert(getString(R.string.status), getString(R.string.setting_up_app_based_transparent_proxying_)); + code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this)); } - + } + + TorService.logMessage ("TorTransProxy resp code: " + code); - return true; - - } - else - { - TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying: DISABLED"); - } - } - else - { - TorTransProxy.purgeIptables(this); - showAlert("Status", "Transparent proxying: DISABLED"); + if (code == 0) + { + showAlert(getString(R.string.status), getString(R.string.transparent_proxying_enabled)); + + + + if (transProxyTethering) + { + showAlert(getString(R.string.status), getString(R.string.transproxy_enabled_for_tethering_)); + TorTransProxy.enableTetheringRules(this); + + } + } + else + { + showAlert(getString(R.string.status), getString(R.string.warning_error_starting_transparent_proxying_)); + } + + return true; } + else + return false; + } + + /* + * activate means whether to apply the users preferences + * or clear them out + * + * the idea is that if Tor is off then transproxy is off + */ + private boolean clearTransparentProxy () throws Exception + { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - return true; + boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); + boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); + + if (hasRoot && enableTransparentProxy) + { + + TorService.logMessage ("Clearing TransProxy rules"); + + TorTransProxy.purgeIptables(this); + + showAlert(getString(R.string.status), getString(R.string.transproxy_rules_cleared)); + + return true; + } + else + return false; } private void runTorShellCmd() throws Exception @@ -657,7 +662,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (procId == -1) { - sendCallbackStatusMessage("Couldn't start Tor process.\nretrying..." + log.toString()); + sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_) + log.toString()); Thread.sleep(torRetryWaitTimeMS); attempts++; } @@ -723,7 +728,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(log.toString()); } - sendCallbackLogMessage("Privoxy is running on port: " + PORT_HTTP); + sendCallbackLogMessage(getString(R.string.privoxy_is_running_on_port_) + PORT_HTTP); logNotice("Privoxy process id=" + privoxyProcId); @@ -926,13 +931,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void showAlert(String title, String msg) { - /* - new AlertDialog.Builder(this) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); - */ showToolbarNotification(msg, NOTIFY_ID, R.drawable.tornotification); } @@ -1088,6 +1086,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { applyPreferences(); + + + + if (currentStatus == STATUS_ON) + { + //reset iptables rules in active mode + + try + { + clearTransparentProxy(); + enableTransparentProxy(); + } + catch (Exception e) + { + logException("unable to setup transproxy",e); + } + } + + } catch (RemoteException e) { logException ("error applying prefs",e); } @@ -1304,20 +1321,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - if (currentStatus == STATUS_ON) - { - //reset iptables rules in active mode - - try - { - setupTransProxy(true); - } - catch (Exception e) - { - logException("unable to setup transproxy",e); - } - } - File fileGeoIP = new File(appBinHome,"geoip"); mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); mBinder.updateConfiguration("EntryNodes", entranceNodes, false); @@ -1332,8 +1335,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (bridgeList == null || bridgeList.length() == 0) { - showAlert("Bridge Error","In order to use the bridge feature, you must enter at least one bridge IP address." + - "Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account."); + showAlert(getString(R.string.bridge_error),getString(R.string.bridge_requires_ip) + + getString(R.string.send_email_for_bridges)); return false; @@ -1383,7 +1386,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert("Config Error","Your ReachableAddresses settings caused an exception!"); + showAlert(getString(R.string.error),getString(R.string.your_reachableaddresses_settings_caused_an_exception_)); return false; } @@ -1409,7 +1412,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - showAlert("Uh-oh!","Your relay settings caused an exception!"); + showAlert(getString(R.string.error),getString(R.string.your_relay_settings_caused_an_exception_)); return false; }

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 12 Nov '11

12 Nov '11

commit 48141d4c0b94b9eda58a6155f5fd13e95202c0eb Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Nov 12 12:21:51 2011 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 365d3f9..9b7af10 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC3" android:versionCode="19"> + package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC4" android:versionCode="20"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[tor-cloud/master] Maybe those lines were necessary after all...
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 1a3d07d0aff8c0cf6a36deda112ed8608d416ad0 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:26:10 2011 +0000 Maybe those lines were necessary after all... --- ec2-prep.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index a5c4ac1..8a436c4 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -184,10 +184,9 @@ fi # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -#echo "Restarting Tor..."; -#/etc/init.d/tor restart -#sudo update-rc.d tor enable -#echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh +echo "Restarting Tor..."; +/etc/init.d/tor restart +update-rc.d tor enable # We're done; tell the user and then reboot the system echo "Done configuring the system, will reboot"

1 0

[tor-cloud/master] Comment out some unnecessary lines
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 88263af151ee5835f0ad33f63c69a45e278011f5 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:06:14 2011 +0000 Comment out some unnecessary lines --- ec2-prep.sh | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 3caac60..a5c4ac1 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -184,9 +184,11 @@ fi # XXX TODO # Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -echo "Restarting Tor..."; -/etc/init.d/tor restart -sudo update-rc.d tor enable -echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh - -sudo reboot +#echo "Restarting Tor..."; +#/etc/init.d/tor restart +#sudo update-rc.d tor enable +#echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh + +# We're done; tell the user and then reboot the system +echo "Done configuring the system, will reboot" +reboot

1 0

[tor-cloud/master] Turns out, cloudimg-rootfs is the correct filesystem label
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 7645cb65de23a1a0a7d6b3750a44262ebe6492ef Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 16:08:09 2011 +0000 Turns out, cloudimg-rootfs is the correct filesystem label --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 0d4e47b..1d34eb5 100755 --- a/build.sh +++ b/build.sh @@ -84,7 +84,7 @@ ec2-attach-volume --instance ${iid} --region ${region} --device /dev/sdh ${vol} echo "After attaching the volume, sleep for 20 seconds..." sleep 20 -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L uec-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS && wget https://uec-images.ubuntu.com/releases/10.04/release/SHA256SUMS.gpg && wget https://uec-images.ubuntu.com/releases/10.04/release/ubuntu-10.04-server-cl… -O ubuntu-10.04-server-cloudimg-i386.tar.gz && tar -Sxvzf /mnt/ubuntu-10.04-server-cloudimg-i386.tar.gz && sudo mkdir src target && sudo mount -o loop,rw /mnt/lucid-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" # TODO: fix GPG verification, exit on failed verification #ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt"

1 0

[tor-cloud/master] The unattended-upgrades package is already installed, just configure it
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 3341078040e31d0ff81596c0addb03205eac6d80 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 15:59:28 2011 +0000 The unattended-upgrades package is already installed, just configure it --- ec2-prep.sh | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index f1426c7..3caac60 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -21,18 +21,14 @@ echo "root required; re-run with sudo"; exit 1; fi -# Install and configure unattended-upgrades. The system will -# automatically download, install and configure all packages, and reboot -# if necessary. -echo "Installing unattended-upgrades..." -aptitude install unattended-upgrades +# Configure unattended-upgrades. The system will automatically download, +# install and configure all packages, and reboot if necessary. +echo "Configuring the unattended-upgrades package..." # Back up the original configuration mv /etc/apt/apt.conf.d/10periodic /etc/apt/apt.conf.d/10periodic.bkp mv /etc/apt/apt.conf.d/50unattended-upgrades /etc/apt/apt.conf.d/50unattended-upgrades.bkp -echo "Configuring the unattended-upgrades package..." - # Choose what to upgrade in 10periodic cat << EOF > $PERIODIC # Update the package list, download, and install available upgrades

1 0

[tor-cloud/master] Option `--to-ports' requires an argument on the same line
by runa＠torproject.org 12 Nov '11

12 Nov '11

commit 3c6de282cc8b0d9f4c6ca193dad4b669052adab9 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Nov 12 15:52:51 2011 +0000 Option `--to-ports' requires an argument on the same line --- ec2-prep.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 32e69e6..f1426c7 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -68,8 +68,7 @@ cat << EOF > $IPTABLES_RULES :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [77:6173] :OUTPUT ACCEPT [77:6173] --A PREROUTING -i eth0 -p tcp -m tcp --dport 443 -j REDIRECT --to-ports -9001 +-A PREROUTING -i eth0 -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 9001 COMMIT EOF

1 0

r25203: {website} Short user manual now available in Spanish (website/trunk/docs/en)
by Runa Sandvik 12 Nov '11

12 Nov '11

Author: runa Date: 2011-11-12 10:23:19 +0000 (Sat, 12 Nov 2011) New Revision: 25203 Modified: website/trunk/docs/en/short-user-manual.wml Log: Short user manual now available in Spanish Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-12 01:10:14 UTC (rev 25202) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-12 10:23:19 UTC (rev 25203) @@ -21,10 +21,11 @@ <p>The user manual is available in the following languages:</p> <ul> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> <li><a href="https://www.torproject.org/dist/manual/short-user-manual_de.xhtml">German</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_es.xhtml">Spanish</a></li> </ul> </div>

1 0

[thandy/master] Add a multiplatform ScriptWrapper
by nickm＠torproject.org 12 Nov '11

12 Nov '11

commit c01e9c0bcef743442c8e44641b8cb0f51585eb6e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Nov 6 14:05:17 2011 -0300 Add a multiplatform ScriptWrapper --- lib/thandy/packagesys/ThpPackages.py | 36 +++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py index af66b80..d90af0c 100644 --- a/lib/thandy/packagesys/ThpPackages.py +++ b/lib/thandy/packagesys/ThpPackages.py @@ -9,6 +9,7 @@ import shutil import subprocess import sys import errno +import traceback from lockfile import LockFile, AlreadyLocked, LockFailed @@ -334,9 +335,9 @@ class ThpPackage(object): env['THP_VERBOSE'] = "1" env['THP_PURGE'] = "0" env['THP_TEMP_DIR'] = self._tmp_path - - sw = ScriptWrapper(os.path.join(self._tmp_path, "meta", - "scripts", script[0]), env) + + sw = ScriptBundleWrapper(os.path.join(self._tmp_path, "meta", + "scripts", script[0]), env) for type in script[1]: self._scripts[type] = sw @@ -397,3 +398,32 @@ class ScriptWrapper(object): env=self._env) self._process.wait() return self._process.returncode + +class ScriptBundleWrapper(object): + """ Wrapper for the scripts that runs the code without spawning + another python process. This is mostly for handling + multiplatform code. """ + def __init__(self, path = None, env = None): + super(ScriptBundleWrapper, self).__init__() + self._path = path + self._env = env + + def run(self): + """ Runs the script using the code class. """ + loc = {} + glob = {} + old_environ = os.environ.copy() + os.environ.clear() + os.environ.update(self._env) + try: + execfile(self._path, loc, glob) + except SystemExit, e: + return 1 + except: + traceback.print_exc() + return 1 + finally: + os.environ.clear() + os.environ.update(old_environ) + + return 0

1 0