[tor-commits] [thandy/master] Update lockfile to work on OSX

nickm at torproject.org nickm at torproject.org
Thu Nov 3 19:14:20 UTC 2011


commit c288511871e2f90016ae7782d55451cbcffe5d5e
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Tue Jul 26 12:47:45 2011 -0300

    Update lockfile to work on OSX
    
    This changes the file modes, it seems OSX needs it this way.
---
 lib/thandy/lockfile/__init__.py         |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/TODO b/TODO
old mode 100644
new mode 100755
diff --git a/config/license-win32-bundle.cfg b/config/license-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/license-win32-package.cfg b/config/license-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/polipo-win32-bundle.cfg b/config/polipo-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/polipo-win32-package.cfg b/config/polipo-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/tor-src-bundle.cfg b/config/tor-src-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/tor-src-package.cfg b/config/tor-src-package.cfg
old mode 100644
new mode 100755
diff --git a/config/tor-win32-bundle.cfg b/config/tor-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/tor-win32-package.cfg b/config/tor-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/torbutton-win32-bundle.cfg b/config/torbutton-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/torbutton-win32-package.cfg b/config/torbutton-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/torvm-win32-bundle.cfg b/config/torvm-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/torvm-win32-package.cfg b/config/torvm-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/vidalia-marble-win32-bundle.cfg b/config/vidalia-marble-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/vidalia-marble-win32-package.cfg b/config/vidalia-marble-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/config/vidalia-win32-bundle.cfg b/config/vidalia-win32-bundle.cfg
old mode 100644
new mode 100755
diff --git a/config/vidalia-win32-package.cfg b/config/vidalia-win32-package.cfg
old mode 100644
new mode 100755
diff --git a/doc/HOWTO b/doc/HOWTO
old mode 100644
new mode 100755
diff --git a/doc/interface.txt b/doc/interface.txt
old mode 100644
new mode 100755
diff --git a/lib/thandy/ClientCLI.py b/lib/thandy/ClientCLI.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/ServerCLI.py b/lib/thandy/ServerCLI.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/SignerCLI.py b/lib/thandy/SignerCLI.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/__init__.py b/lib/thandy/__init__.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/bt_compat.py b/lib/thandy/bt_compat.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/checkJson.py b/lib/thandy/checkJson.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/download.py b/lib/thandy/download.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/encodeToXML.py b/lib/thandy/encodeToXML.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/keys.py b/lib/thandy/keys.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/lockfile/__init__.py b/lib/thandy/lockfile/__init__.py
old mode 100644
new mode 100755
index a167cd8..6ed31d5
--- a/lib/thandy/lockfile/__init__.py
+++ b/lib/thandy/lockfile/__init__.py
@@ -168,6 +168,8 @@ class LockBase:
             # Thread objects in Python 2.4 and earlier do not have ident
             # attrs.  Worm around that.
             ident = getattr(t, "ident", hash(t))
+            if ident is None:
+              ident = hash(t)
             self.tname = "-%x" % (ident & 0xffffffff)
         else:
             self.tname = ""
diff --git a/lib/thandy/lockfile/linklockfile.py b/lib/thandy/lockfile/linklockfile.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/lockfile/mkdirlockfile.py b/lib/thandy/lockfile/mkdirlockfile.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/lockfile/pidlockfile.py b/lib/thandy/lockfile/pidlockfile.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/lockfile/sqlitelockfile.py b/lib/thandy/lockfile/sqlitelockfile.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/master_keys.py b/lib/thandy/master_keys.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/ExePackages.py b/lib/thandy/packagesys/ExePackages.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/PackageDB.py b/lib/thandy/packagesys/PackageDB.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/PackageSystem.py b/lib/thandy/packagesys/PackageSystem.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/RPMPackages.py b/lib/thandy/packagesys/RPMPackages.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/packagesys/__init__.py b/lib/thandy/packagesys/__init__.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/socksurls.py b/lib/thandy/socksurls.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/tests.py b/lib/thandy/tests.py
old mode 100644
new mode 100755
diff --git a/lib/thandy/util.py b/lib/thandy/util.py
old mode 100644
new mode 100755
diff --git a/samples/example-bundle.cfg b/samples/example-bundle.cfg
old mode 100644
new mode 100755
diff --git a/samples/example-mirrors.txt b/samples/example-mirrors.txt
old mode 100644
new mode 100755
diff --git a/samples/example-package.cfg b/samples/example-package.cfg
old mode 100644
new mode 100755
diff --git a/samples/example-thp-package.cfg b/samples/example-thp-package.cfg
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
diff --git a/specs/thandy-spec.txt b/specs/thandy-spec.txt
old mode 100644
new mode 100755





More information about the tor-commits mailing list