summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@torproject.org>2011-07-26 12:47:45 -0300
committerTomás Touceda <chiiph@torproject.org>2011-07-26 12:47:45 -0300
commitc288511871e2f90016ae7782d55451cbcffe5d5e (patch)
tree8ce05196d39a40787a1ca660f9a5b2d9a09d869a
parent93cc09c9d8f44f4f9e27e74cf9937d4db001b9c7 (diff)
Update lockfile to work on OSX
This changes the file modes, it seems OSX needs it this way.
-rwxr-xr-x[-rw-r--r--].gitignore0
-rwxr-xr-x[-rw-r--r--]LICENSE0
-rwxr-xr-x[-rw-r--r--]Makefile0
-rwxr-xr-x[-rw-r--r--]TODO0
-rwxr-xr-x[-rw-r--r--]config/license-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/license-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/polipo-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/polipo-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/tor-src-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/tor-src-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/tor-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/tor-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/torbutton-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/torbutton-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/torvm-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/torvm-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/vidalia-marble-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/vidalia-marble-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]config/vidalia-win32-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]config/vidalia-win32-package.cfg0
-rwxr-xr-x[-rw-r--r--]doc/HOWTO0
-rwxr-xr-x[-rw-r--r--]doc/interface.txt0
-rwxr-xr-x[-rw-r--r--]lib/thandy/ClientCLI.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/ServerCLI.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/SignerCLI.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/__init__.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/bt_compat.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/checkJson.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/download.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/encodeToXML.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/formats.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/keys.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/__init__.py2
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/linklockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/mkdirlockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/pidlockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/lockfile/sqlitelockfile.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/master_keys.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/ExePackages.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/PackageDB.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/PackageSystem.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/RPMPackages.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/ThpPackages.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/packagesys/__init__.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/repository.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/socksurls.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/tests.py0
-rwxr-xr-x[-rw-r--r--]lib/thandy/util.py0
-rwxr-xr-x[-rw-r--r--]samples/example-bundle.cfg0
-rwxr-xr-x[-rw-r--r--]samples/example-mirrors.txt0
-rwxr-xr-x[-rw-r--r--]samples/example-package.cfg0
-rwxr-xr-x[-rw-r--r--]samples/example-thp-package.cfg0
-rwxr-xr-x[-rw-r--r--]setup.py0
-rwxr-xr-x[-rw-r--r--]specs/thandy-spec.txt0
54 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7424e57..7424e57 100644..100755
--- a/.gitignore
+++ b/.gitignore
diff --git a/LICENSE b/LICENSE
index 8cf439a..8cf439a 100644..100755
--- a/LICENSE
+++ b/LICENSE
diff --git a/Makefile b/Makefile
index 58f019c..58f019c 100644..100755
--- a/Makefile
+++ b/Makefile
diff --git a/TODO b/TODO
index 71c0c7e..71c0c7e 100644..100755
--- a/TODO
+++ b/TODO
diff --git a/config/license-win32-bundle.cfg b/config/license-win32-bundle.cfg
index c451337..c451337 100644..100755
--- a/config/license-win32-bundle.cfg
+++ b/config/license-win32-bundle.cfg
diff --git a/config/license-win32-package.cfg b/config/license-win32-package.cfg
index 0ac5f82..0ac5f82 100644..100755
--- a/config/license-win32-package.cfg
+++ b/config/license-win32-package.cfg
diff --git a/config/polipo-win32-bundle.cfg b/config/polipo-win32-bundle.cfg
index b2ab160..b2ab160 100644..100755
--- a/config/polipo-win32-bundle.cfg
+++ b/config/polipo-win32-bundle.cfg
diff --git a/config/polipo-win32-package.cfg b/config/polipo-win32-package.cfg
index 667ab16..667ab16 100644..100755
--- a/config/polipo-win32-package.cfg
+++ b/config/polipo-win32-package.cfg
diff --git a/config/tor-src-bundle.cfg b/config/tor-src-bundle.cfg
index d063475..d063475 100644..100755
--- a/config/tor-src-bundle.cfg
+++ b/config/tor-src-bundle.cfg
diff --git a/config/tor-src-package.cfg b/config/tor-src-package.cfg
index 1b8e949..1b8e949 100644..100755
--- a/config/tor-src-package.cfg
+++ b/config/tor-src-package.cfg
diff --git a/config/tor-win32-bundle.cfg b/config/tor-win32-bundle.cfg
index 3a3a163..3a3a163 100644..100755
--- a/config/tor-win32-bundle.cfg
+++ b/config/tor-win32-bundle.cfg
diff --git a/config/tor-win32-package.cfg b/config/tor-win32-package.cfg
index bf04f27..bf04f27 100644..100755
--- a/config/tor-win32-package.cfg
+++ b/config/tor-win32-package.cfg
diff --git a/config/torbutton-win32-bundle.cfg b/config/torbutton-win32-bundle.cfg
index 26fb567..26fb567 100644..100755
--- a/config/torbutton-win32-bundle.cfg
+++ b/config/torbutton-win32-bundle.cfg
diff --git a/config/torbutton-win32-package.cfg b/config/torbutton-win32-package.cfg
index c3b89d1..c3b89d1 100644..100755
--- a/config/torbutton-win32-package.cfg
+++ b/config/torbutton-win32-package.cfg
diff --git a/config/torvm-win32-bundle.cfg b/config/torvm-win32-bundle.cfg
index 52ef59e..52ef59e 100644..100755
--- a/config/torvm-win32-bundle.cfg
+++ b/config/torvm-win32-bundle.cfg
diff --git a/config/torvm-win32-package.cfg b/config/torvm-win32-package.cfg
index 46987ec..46987ec 100644..100755
--- a/config/torvm-win32-package.cfg
+++ b/config/torvm-win32-package.cfg
diff --git a/config/vidalia-marble-win32-bundle.cfg b/config/vidalia-marble-win32-bundle.cfg
index a712ec4..a712ec4 100644..100755
--- a/config/vidalia-marble-win32-bundle.cfg
+++ b/config/vidalia-marble-win32-bundle.cfg
diff --git a/config/vidalia-marble-win32-package.cfg b/config/vidalia-marble-win32-package.cfg
index 3db8cf1..3db8cf1 100644..100755
--- a/config/vidalia-marble-win32-package.cfg
+++ b/config/vidalia-marble-win32-package.cfg
diff --git a/config/vidalia-win32-bundle.cfg b/config/vidalia-win32-bundle.cfg
index 7a18f78..7a18f78 100644..100755
--- a/config/vidalia-win32-bundle.cfg
+++ b/config/vidalia-win32-bundle.cfg
diff --git a/config/vidalia-win32-package.cfg b/config/vidalia-win32-package.cfg
index 20d91e3..20d91e3 100644..100755
--- a/config/vidalia-win32-package.cfg
+++ b/config/vidalia-win32-package.cfg
diff --git a/doc/HOWTO b/doc/HOWTO
index 4ec6068..4ec6068 100644..100755
--- a/doc/HOWTO
+++ b/doc/HOWTO
diff --git a/doc/interface.txt b/doc/interface.txt
index b50442b..b50442b 100644..100755
--- a/doc/interface.txt
+++ b/doc/interface.txt
diff --git a/lib/thandy/ClientCLI.py b/lib/thandy/ClientCLI.py
index 75aa347..75aa347 100644..100755
--- a/lib/thandy/ClientCLI.py
+++ b/lib/thandy/ClientCLI.py
diff --git a/lib/thandy/ServerCLI.py b/lib/thandy/ServerCLI.py
index 4b6c1a6..4b6c1a6 100644..100755
--- a/lib/thandy/ServerCLI.py
+++ b/lib/thandy/ServerCLI.py
diff --git a/lib/thandy/SignerCLI.py b/lib/thandy/SignerCLI.py
index fd22c69..fd22c69 100644..100755
--- a/lib/thandy/SignerCLI.py
+++ b/lib/thandy/SignerCLI.py
diff --git a/lib/thandy/__init__.py b/lib/thandy/__init__.py
index 6b00c05..6b00c05 100644..100755
--- a/lib/thandy/__init__.py
+++ b/lib/thandy/__init__.py
diff --git a/lib/thandy/bt_compat.py b/lib/thandy/bt_compat.py
index e9298a6..e9298a6 100644..100755
--- a/lib/thandy/bt_compat.py
+++ b/lib/thandy/bt_compat.py
diff --git a/lib/thandy/checkJson.py b/lib/thandy/checkJson.py
index ab33d00..ab33d00 100644..100755
--- a/lib/thandy/checkJson.py
+++ b/lib/thandy/checkJson.py
diff --git a/lib/thandy/download.py b/lib/thandy/download.py
index 52c6fe4..52c6fe4 100644..100755
--- a/lib/thandy/download.py
+++ b/lib/thandy/download.py
diff --git a/lib/thandy/encodeToXML.py b/lib/thandy/encodeToXML.py
index b2fe351..b2fe351 100644..100755
--- a/lib/thandy/encodeToXML.py
+++ b/lib/thandy/encodeToXML.py
diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
index f57ab46..f57ab46 100644..100755
--- a/lib/thandy/formats.py
+++ b/lib/thandy/formats.py
diff --git a/lib/thandy/keys.py b/lib/thandy/keys.py
index 9eb98d0..9eb98d0 100644..100755
--- a/lib/thandy/keys.py
+++ b/lib/thandy/keys.py
diff --git a/lib/thandy/lockfile/__init__.py b/lib/thandy/lockfile/__init__.py
index a167cd8..6ed31d5 100644..100755
--- 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
index 737fd08..737fd08 100644..100755
--- a/lib/thandy/lockfile/linklockfile.py
+++ b/lib/thandy/lockfile/linklockfile.py
diff --git a/lib/thandy/lockfile/mkdirlockfile.py b/lib/thandy/lockfile/mkdirlockfile.py
index fb78902..fb78902 100644..100755
--- a/lib/thandy/lockfile/mkdirlockfile.py
+++ b/lib/thandy/lockfile/mkdirlockfile.py
diff --git a/lib/thandy/lockfile/pidlockfile.py b/lib/thandy/lockfile/pidlockfile.py
index 10dcb31..10dcb31 100644..100755
--- a/lib/thandy/lockfile/pidlockfile.py
+++ b/lib/thandy/lockfile/pidlockfile.py
diff --git a/lib/thandy/lockfile/sqlitelockfile.py b/lib/thandy/lockfile/sqlitelockfile.py
index d044d2a..d044d2a 100644..100755
--- a/lib/thandy/lockfile/sqlitelockfile.py
+++ b/lib/thandy/lockfile/sqlitelockfile.py
diff --git a/lib/thandy/master_keys.py b/lib/thandy/master_keys.py
index 4d0bdac..4d0bdac 100644..100755
--- a/lib/thandy/master_keys.py
+++ b/lib/thandy/master_keys.py
diff --git a/lib/thandy/packagesys/ExePackages.py b/lib/thandy/packagesys/ExePackages.py
index 1928ef3..1928ef3 100644..100755
--- a/lib/thandy/packagesys/ExePackages.py
+++ b/lib/thandy/packagesys/ExePackages.py
diff --git a/lib/thandy/packagesys/PackageDB.py b/lib/thandy/packagesys/PackageDB.py
index 7420868..7420868 100644..100755
--- a/lib/thandy/packagesys/PackageDB.py
+++ b/lib/thandy/packagesys/PackageDB.py
diff --git a/lib/thandy/packagesys/PackageSystem.py b/lib/thandy/packagesys/PackageSystem.py
index d1060d0..d1060d0 100644..100755
--- a/lib/thandy/packagesys/PackageSystem.py
+++ b/lib/thandy/packagesys/PackageSystem.py
diff --git a/lib/thandy/packagesys/RPMPackages.py b/lib/thandy/packagesys/RPMPackages.py
index 331ef8e..331ef8e 100644..100755
--- a/lib/thandy/packagesys/RPMPackages.py
+++ b/lib/thandy/packagesys/RPMPackages.py
diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py
index 0579b5c..0579b5c 100644..100755
--- a/lib/thandy/packagesys/ThpPackages.py
+++ b/lib/thandy/packagesys/ThpPackages.py
diff --git a/lib/thandy/packagesys/__init__.py b/lib/thandy/packagesys/__init__.py
index dc0825b..dc0825b 100644..100755
--- a/lib/thandy/packagesys/__init__.py
+++ b/lib/thandy/packagesys/__init__.py
diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py
index f0b51b8..f0b51b8 100644..100755
--- a/lib/thandy/repository.py
+++ b/lib/thandy/repository.py
diff --git a/lib/thandy/socksurls.py b/lib/thandy/socksurls.py
index ee556ab..ee556ab 100644..100755
--- a/lib/thandy/socksurls.py
+++ b/lib/thandy/socksurls.py
diff --git a/lib/thandy/tests.py b/lib/thandy/tests.py
index e55c07d..e55c07d 100644..100755
--- a/lib/thandy/tests.py
+++ b/lib/thandy/tests.py
diff --git a/lib/thandy/util.py b/lib/thandy/util.py
index 606d6c0..606d6c0 100644..100755
--- a/lib/thandy/util.py
+++ b/lib/thandy/util.py
diff --git a/samples/example-bundle.cfg b/samples/example-bundle.cfg
index 9a9c2f5..9a9c2f5 100644..100755
--- a/samples/example-bundle.cfg
+++ b/samples/example-bundle.cfg
diff --git a/samples/example-mirrors.txt b/samples/example-mirrors.txt
index cf9708e..cf9708e 100644..100755
--- a/samples/example-mirrors.txt
+++ b/samples/example-mirrors.txt
diff --git a/samples/example-package.cfg b/samples/example-package.cfg
index 46a57b7..46a57b7 100644..100755
--- a/samples/example-package.cfg
+++ b/samples/example-package.cfg
diff --git a/samples/example-thp-package.cfg b/samples/example-thp-package.cfg
index e7e410c..e7e410c 100644..100755
--- a/samples/example-thp-package.cfg
+++ b/samples/example-thp-package.cfg
diff --git a/setup.py b/setup.py
index 10eca8f..10eca8f 100644..100755
--- a/setup.py
+++ b/setup.py
diff --git a/specs/thandy-spec.txt b/specs/thandy-spec.txt
index 0db9df1..0db9df1 100644..100755
--- a/specs/thandy-spec.txt
+++ b/specs/thandy-spec.txt