]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/log
tahoe-lafs/tahoe-lafs.git
9 years agoEnsure that path parameters to SFTPServer and FTPServer constructors are unicode... 2388.fix-paths-must-be-unicode-strings.1
Daira Hopwood [Tue, 3 Mar 2015 20:06:35 +0000 (20:06 +0000)]
Ensure that path parameters to SFTPServer and FTPServer constructors are unicode. refs #2388

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd from_utf8_or_none and tests.
Daira Hopwood [Tue, 3 Mar 2015 20:04:57 +0000 (20:04 +0000)]
Add from_utf8_or_none and tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years ago.travis.yml: emove 'sudo: false' as requested by https://github.com/travis-ci/travis...
Daira Hopwood [Fri, 27 Feb 2015 23:59:18 +0000 (23:59 +0000)]
.travis.yml: emove 'sudo: false' as requested by https://github.com/travis-ci/travis-ci/issues/2389#issuecomment-76202191

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoNEWS.rst: add partial list of changes
Brian Warner [Thu, 26 Feb 2015 06:04:25 +0000 (22:04 -0800)]
NEWS.rst: add partial list of changes

9 years agozetuptoolz: print out more context in case of parse_requirements error
Zooko [Tue, 24 Feb 2015 18:11:30 +0000 (18:11 +0000)]
zetuptoolz: print out more context in case of parse_requirements error

9 years agotahoe_cp.py: use s.basename() instead of tracking it separately
Brian Warner [Tue, 24 Feb 2015 10:07:57 +0000 (02:07 -0800)]
tahoe_cp.py: use s.basename() instead of tracking it separately

9 years agotahoe_cp.py: store basename in the Source instance
Brian Warner [Tue, 24 Feb 2015 09:55:53 +0000 (01:55 -0800)]
tahoe_cp.py: store basename in the Source instance

9 years agotest_cli.py: split the largest test classes out into separate files
Brian Warner [Mon, 23 Feb 2015 06:31:14 +0000 (22:31 -0800)]
test_cli.py: split the largest test classes out into separate files

That file was getting unruly. No behavioral changes, apart from tests
now having different names.

9 years agoDiscourage future readers of iputil.py from using Win32 APIs in preference to route...
Daira Hopwood [Thu, 19 Feb 2015 17:41:09 +0000 (17:41 +0000)]
Discourage future readers of iputil.py from using Win32 APIs in preference to route.exe.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoIt is Twisted 12.2.0 that starts depending on pywin32 for endpoints, not Twisted...
Daira Hopwood [Tue, 17 Feb 2015 19:11:57 +0000 (19:11 +0000)]
It is Twisted 12.2.0 that starts depending on pywin32 for endpoints, not Twisted 12.3.0.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoExplicitly using "git.cmd" on Windows doesn't always work; use shell=True on Windows...
Daira Hopwood [Tue, 17 Feb 2015 19:10:54 +0000 (19:10 +0000)]
Explicitly using "git.cmd" on Windows doesn't always work; use shell=True on Windows instead.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMerge pull request #142 from tahoe-lafs/754.location-AUTO.2
Daira Hopwood [Tue, 10 Feb 2015 18:28:09 +0000 (18:28 +0000)]
Merge pull request #142 from tahoe-lafs/754.location-AUTO.2

Allow combining autodetected and statically configured locations

9 years agoDocumentation change for AUTO in tub.location. refs #754 754.location-AUTO.2 142/head
Daira Hopwood [Tue, 10 Feb 2015 18:23:59 +0000 (18:23 +0000)]
Documentation change for AUTO in tub.location. refs #754

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAllow multiple occurrences of AUTO. refs #754
Daira Hopwood [Tue, 10 Feb 2015 17:31:10 +0000 (17:31 +0000)]
Allow multiple occurrences of AUTO. refs #754

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd tests for combining autodetected and statically configured locations. refs #754
Daira Hopwood [Mon, 9 Feb 2015 19:48:06 +0000 (19:48 +0000)]
Add tests for combining autodetected and statically configured locations. refs #754

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agotest_node.py: refactor test_location* to reduce code duplication. refs #754
Daira Hopwood [Mon, 9 Feb 2015 19:45:31 +0000 (19:45 +0000)]
test_node.py: refactor test_location* to reduce code duplication. refs #754

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoOnly get the local addresses if they are actually used. refs #754
Daira Hopwood [Mon, 9 Feb 2015 19:20:42 +0000 (19:20 +0000)]
Only get the local addresses if they are actually used. refs #754

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAllow combining autodetected and statically configured locations. fixes #754
Daira Hopwood [Mon, 9 Feb 2015 19:18:58 +0000 (19:18 +0000)]
Allow combining autodetected and statically configured locations. fixes #754
Replaces the location 'AUTO' with the autodetected IP/port combination.

Author: Chris Kerr <debdepba@dasganma.tk>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years ago.travis.yml: add "sudo: false" option, to attempt to resolve "Connection reset by...
Daira Hopwood [Sat, 7 Feb 2015 02:45:10 +0000 (02:45 +0000)]
.travis.yml: add "sudo: false" option, to attempt to resolve "Connection reset by peer" problems during build.
See https://github.com/travis-ci/travis-ci/issues/2389 .

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix warnings due to bitrot in MANIFEST.in. closes #2380
Daira Hopwood [Fri, 6 Feb 2015 23:59:12 +0000 (23:59 +0000)]
Fix warnings due to bitrot in MANIFEST.in. closes #2380

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoTest the quotemarks=True and quotemarks=False options of quote_local_unicode_path.
Daira Hopwood [Thu, 5 Feb 2015 02:22:27 +0000 (02:22 +0000)]
Test the quotemarks=True and quotemarks=False options of quote_local_unicode_path.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoTest the quotemarks=False option of encodingutil.quote_path.
Daira Hopwood [Thu, 5 Feb 2015 02:13:23 +0000 (02:13 +0000)]
Test the quotemarks=False option of encodingutil.quote_path.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFurther refine error handling in windows_getenv to correctly handle zero-length envir...
Daira Hopwood [Wed, 4 Feb 2015 17:02:02 +0000 (17:02 +0000)]
Further refine error handling in windows_getenv to correctly handle zero-length environment values. refs #1674

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoremove stray trailing whitespace
Brian Warner [Wed, 4 Feb 2015 09:35:44 +0000 (01:35 -0800)]
remove stray trailing whitespace

9 years agoMerge branch 'pr138': fix long paths on windows
Brian Warner [Wed, 4 Feb 2015 09:31:46 +0000 (01:31 -0800)]
Merge branch 'pr138': fix long paths on windows

9 years agotest that web.static= is really treated as a relative path
Brian Warner [Wed, 4 Feb 2015 06:09:40 +0000 (22:09 -0800)]
test that web.static= is really treated as a relative path

Also ssh.authorized_keys_file .

9 years agoQuote the default node-directory correctly in help output. refs #2235
Daira Hopwood [Wed, 4 Feb 2015 00:10:21 +0000 (00:10 +0000)]
Quote the default node-directory correctly in help output. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMore robust error handling in windows_getenv. refs #1674
Daira Hopwood [Tue, 3 Feb 2015 23:47:31 +0000 (23:47 +0000)]
More robust error handling in windows_getenv. refs #1674

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agotahoe_cp.py: clean up unicode handling
Brian Warner [Tue, 3 Feb 2015 19:10:36 +0000 (11:10 -0800)]
tahoe_cp.py: clean up unicode handling

9 years agoChanges filename to unicode before placing the file. refs #2027 2235-long-paths-on-windows-7 138/head
Daira Hopwood [Sat, 11 Oct 2014 22:45:13 +0000 (23:45 +0100)]
Changes filename to unicode before placing the file. refs #2027

Author: Mark Berger <mark.berger.j@gmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdds test_ticket_2027 to test_cli.Cp. refs #2027
Daira Hopwood [Sat, 11 Oct 2014 22:43:23 +0000 (23:43 +0100)]
Adds test_ticket_2027 to test_cli.Cp. refs #2027

Author: Mark Berger <mark.berger.j@gmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoFix user-path-expansion on Windows for non-ASCII home directories. refs #1674
Daira Hopwood [Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)]
Fix user-path-expansion on Windows for non-ASCII home directories. refs #1674

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoChange uses of os.path.expanduser and os.path.abspath. refs #2235
Daira Hopwood [Fri, 30 Jan 2015 00:50:18 +0000 (00:50 +0000)]
Change uses of os.path.expanduser and os.path.abspath. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoUse absolute paths in tahoe cp and tahoe backup. refs #2235
Daira Hopwood [Mon, 25 Aug 2014 18:09:40 +0000 (19:09 +0100)]
Use absolute paths in tahoe cp and tahoe backup. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd support in abspath_expanduser_unicode for expanding relative to a base path....
Daira Hopwood [Fri, 30 Jan 2015 00:47:09 +0000 (00:47 +0000)]
Add support in abspath_expanduser_unicode for expanding relative to a base path. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoQuote local paths correctly. refs #2235
Daira Hopwood [Fri, 30 Jan 2015 00:04:11 +0000 (00:04 +0000)]
Quote local paths correctly. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoUse "long" paths prefixed with \\?\ on Windows. refs #2235
Daira Hopwood [Fri, 30 Jan 2015 00:05:14 +0000 (00:05 +0000)]
Use "long" paths prefixed with \\?\ on Windows. refs #2235

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agofileutil cleanup: delete the unused open_or_create function.
Daira Hopwood [Mon, 25 Aug 2014 17:24:59 +0000 (18:24 +0100)]
fileutil cleanup: delete the unused open_or_create function.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdds _servers_with_shares to ServermapUpdater
Mark Berger [Tue, 23 Jul 2013 16:53:22 +0000 (12:53 -0400)]
Adds _servers_with_shares to ServermapUpdater

When calculating the query boundary for updates to mutable files,
instead of using servers that used to have shares, use servers we
have added to the servermap. This way the querying process won't finish
until we have finished interacting with the servers that have shares.

This fixes the race condition which sometimes caused the querying process
to finish before the updater was done talking to servers with shares.

9 years agoRevert "Enable DeprecationWarnings for Travis-CI even on Python 2.7. refs #2366"
Brian Warner [Tue, 27 Jan 2015 06:05:38 +0000 (22:05 -0800)]
Revert "Enable DeprecationWarnings for Travis-CI even on Python 2.7. refs #2366"

This reverts commit cec7727bf980f62ba5e98d11776edb658860e350.

It caused travis (for py2.7) to fail on these tests:

* allmydata.test.test_runner.BinTahoe.test_version_no_noise
* allmydata.test.test_runner.RunNode.test_client_no_noise
* allmydata.test.test_system.SystemTest.test_filesystem_with_cli_in_subprocess

9 years agoEnable DeprecationWarnings for Travis-CI even on Python 2.7. refs #2366
Daira Hopwood [Thu, 22 Jan 2015 02:49:16 +0000 (02:49 +0000)]
Enable DeprecationWarnings for Travis-CI even on Python 2.7. refs #2366

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMerge pull request #137 from warner/2312-deprecation
Daira Hopwood [Thu, 22 Jan 2015 02:29:50 +0000 (02:29 +0000)]
Merge pull request #137 from warner/2312-deprecation

Appease req.setHeader by passing bytes, not ints.

9 years agoAppease req.setHeader by passing bytes, not ints. 137/head
Brian Warner [Wed, 21 Jan 2015 18:31:31 +0000 (10:31 -0800)]
Appease req.setHeader by passing bytes, not ints.

twisted.web.http.Request.setHeader() really wants a "bytes" object, but
we've been passing integers like len(body). Twisted-12.3 started to
complain about this (with a DeprecationWarning), but the warning is
usually silenced because py2.7 disables deprecations by default.

This fixes Tahoe's misbehavior, but others remain (in Nevow, at least).
I plan to set up some tooling to run tests with
PYTHONWARNINGS=default::DeprecationWarning and collect others. We won't
be able to fix the ones that occur outside of Tahoe, but at least we
should be able to fix our own.

refs ticket:2312

9 years agoMerge branch 'pr136' (WUI accessibility fix #1961)
Brian Warner [Wed, 21 Jan 2015 01:25:02 +0000 (17:25 -0800)]
Merge branch 'pr136' (WUI accessibility fix #1961)

This closes ticket:1961 .

9 years agowelcome.xhtml: improve layout by floating the icons to the left.
Brian Warner [Wed, 21 Jan 2015 01:24:27 +0000 (17:24 -0800)]
welcome.xhtml: improve layout by floating the icons to the left.

This uses less vertical space.

9 years agoIntroduce icons with distinct shape for connection status display on the front wui... 136/head
Nathan Wilcox [Wed, 21 Jan 2015 00:31:56 +0000 (16:31 -0800)]
Introduce icons with distinct shape for connection status display on the front wui page...

This replaces the status display which was only distinct by color which is a usability issue for color-blind users.  This commit includes test coverage by way of pattern matching on rendered templates.  The PNG icons are conversions of original SVG source which I've included and placed in the public domain.

9 years agoLatest cryptography depends on enum34.
Daira Hopwood [Fri, 26 Dec 2014 22:29:42 +0000 (22:29 +0000)]
Latest cryptography depends on enum34.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agodependecy specs: tolerate new PEP440 semantics too
Daira Hopwood [Tue, 20 Jan 2015 18:52:02 +0000 (10:52 -0800)]
dependecy specs: tolerate new PEP440 semantics too

The latest setuptools (version 8) changed the way dependency
specifications ("I can handle libfoo version 2 or 3, but not 4") are
interpreted. The new version follows PEP440, which is simpler but
somewhat less expressive. Tahoe's _auto_deps.py now uses dep-specs which
are correctly parsed by both old and new setuptools.

Fixes ticket:2354.

* Restrict the requirements in _auto_deps.py to work with either the old
  or PEP 440 semantics.
* Update check_requirement and tests to take account of changes for PEP
  440 compatibility.
* Fix an error message.
* Remove a superfluous TODO.

9 years agoMerge pull request #135 from vu3rdd/182-osx-packaging-7
Daira Hopwood [Thu, 15 Jan 2015 02:44:34 +0000 (02:44 +0000)]
Merge pull request #135 from vu3rdd/182-osx-packaging-7

Makefile: make "build-osx-pkg" build target depend on the "build" target

9 years agoMakefile: make "build-osx-pkg" build target depend on the "build" target 135/head
Ramakrishnan Muthukrishnan [Tue, 13 Jan 2015 09:31:46 +0000 (15:01 +0530)]
Makefile: make "build-osx-pkg" build target depend on the "build" target

9 years agoUpdate docs for SFTP public key auth. refs #1411
Daira Hopwood [Tue, 6 Jan 2015 19:14:47 +0000 (19:14 +0000)]
Update docs for SFTP public key auth. refs #1411

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoReserve all keytypes starting with "ssh-" in an accounts file, rather than only ...
Daira Hopwood [Tue, 6 Jan 2015 19:09:04 +0000 (19:09 +0000)]
Reserve all keytypes starting with "ssh-" in an accounts file, rather than only "ssh-rsa" and "ssh-dsa".

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd Jean-Paul Calderone to CREDITS. refs #1411
Daira Hopwood [Tue, 6 Jan 2015 18:36:50 +0000 (18:36 +0000)]
Add Jean-Paul Calderone to CREDITS. refs #1411

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoSimplify key checking code by inlining _allowedKey and _correctSignature. refs #1141
Daira Hopwood [Tue, 6 Jan 2015 18:10:41 +0000 (18:10 +0000)]
Simplify key checking code by inlining _allowedKey and _correctSignature. refs #1141

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoGive out FTPAvatarID objects instead. 134/head
Jean-Paul Calderone [Sun, 4 Jan 2015 14:48:38 +0000 (09:48 -0500)]
Give out FTPAvatarID objects instead.

9 years agoAdd the rest of the failure-case tests and a success-case test. Update the implement...
Jean-Paul Calderone [Sun, 4 Jan 2015 14:44:56 +0000 (09:44 -0500)]
Add the rest of the failure-case tests and a success-case test.  Update the implementation to make them pass.

9 years agoAdd a test for the bad key case of unauthorized ssh key checking.
Jean-Paul Calderone [Sun, 4 Jan 2015 13:02:49 +0000 (08:02 -0500)]
Add a test for the bad key case of unauthorized ssh key checking.

9 years agoAdd a test for one unauthorized case of ssh key checking.
Jean-Paul Calderone [Sun, 4 Jan 2015 13:02:23 +0000 (08:02 -0500)]
Add a test for one unauthorized case of ssh key checking.

9 years agoMerge pull request #133 from matthazinski/master
Daira Hopwood [Tue, 30 Dec 2014 19:56:29 +0000 (19:56 +0000)]
Merge pull request #133 from matthazinski/master

Move UDP listen inside try block

9 years agoMove UDP listen inside try block 133/head
Matt Hazinski [Tue, 30 Dec 2014 01:21:24 +0000 (20:21 -0500)]
Move UDP listen inside try block

10 years agoFix minor dependencies on "allmydata-tahoe" as appname.
Daira Hopwood [Fri, 5 Dec 2014 23:29:07 +0000 (23:29 +0000)]
Fix minor dependencies on "allmydata-tahoe" as appname.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoMakefile: make APPNAME a variable.
Daira Hopwood [Fri, 5 Dec 2014 17:53:13 +0000 (17:53 +0000)]
Makefile: make APPNAME a variable.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoUpdate obsolete paths in munin plugin comments.
Daira Hopwood [Fri, 5 Dec 2014 17:52:13 +0000 (17:52 +0000)]
Update obsolete paths in munin plugin comments.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agomisc/build_helpers/run_trial.py is no longer used.
Daira Hopwood [Fri, 5 Dec 2014 17:50:59 +0000 (17:50 +0000)]
misc/build_helpers/run_trial.py is no longer used.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoWork around a Travis-CI configuration change.
Daira Hopwood [Thu, 27 Nov 2014 16:37:25 +0000 (16:37 +0000)]
Work around a Travis-CI configuration change.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agotest_storage_client.py: add test_get_available_space_{old,new}.
Daira Hopwood [Sun, 23 Nov 2014 05:46:33 +0000 (05:46 +0000)]
test_storage_client.py: add test_get_available_space_{old,new}.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoadd available-space to VERSION_DEFAULTS
Leif Ryge [Sat, 22 Nov 2014 04:30:02 +0000 (04:30 +0000)]
add available-space to VERSION_DEFAULTS

as per warner's suggestion in https://github.com/warner/tahoe-lafs/pull/4

10 years agotests for "Available" column (#648)
Leif Ryge [Sat, 22 Nov 2014 02:12:36 +0000 (02:12 +0000)]
tests for "Available" column (#648)

thanks to the anonymous author who posted this on trac

10 years agoadd "Available" column to welcome page (#648)
Leif Ryge [Thu, 20 Nov 2014 22:46:20 +0000 (22:46 +0000)]
add "Available" column to welcome page (#648)

add get_available_space() to NativeStorageServer

It uses a new 'available-space' key in the server's v1 version dict, or falls
back to 'maximum-immutable-share-size' (which presently always has the same
value but could have a different meaning in the future).

This is a squash merge of 9773555bb87fab71145ad7a0e84785a4e92d11f7

10 years agoMerge pull request #126 from leif/remove-cruft
Daira Hopwood [Sun, 23 Nov 2014 03:52:49 +0000 (03:52 +0000)]
Merge pull request #126 from leif/remove-cruft

remove NativeStorageServer's unused min_shares argument

10 years agorm NativeStorageServer's unused min_shares argument 126/head
Leif Ryge [Sat, 22 Nov 2014 04:08:45 +0000 (04:08 +0000)]
rm NativeStorageServer's unused min_shares argument

10 years agoMerge pull request #125 from tahoe-lafs/2340-version-error-reporting-3
zooko [Fri, 21 Nov 2014 17:46:05 +0000 (17:46 +0000)]
Merge pull request #125 from tahoe-lafs/2340-version-error-reporting-3

2340 version error reporting 3

10 years agosetup.py: look for a tag named after APPNAME, not necessarily "allmydata-tahoe".... 2340-version-error-reporting-3 125/head
Daira Hopwood [Fri, 21 Nov 2014 05:00:05 +0000 (05:00 +0000)]
setup.py: look for a tag named after APPNAME, not necessarily "allmydata-tahoe". refs #1146

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agosetup.py: set distribution.metadata.version from _version.py if we couldn't find...
Daira Hopwood [Fri, 21 Nov 2014 08:38:37 +0000 (08:38 +0000)]
setup.py: set distribution.metadata.version from _version.py if we couldn't find it from git.
This simplifies reporting when we don't have the version. Also print the normalized version. refs #2340

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agosetup.py: use constant for _version.py filename.
Daira Hopwood [Fri, 21 Nov 2014 07:56:21 +0000 (07:56 +0000)]
setup.py: use constant for _version.py filename.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agosetup.py: improve error reporting when git commands fail. refs #2340
Daira Hopwood [Fri, 21 Nov 2014 05:14:18 +0000 (05:14 +0000)]
setup.py: improve error reporting when git commands fail. refs #2340

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agotest-osx-pkg.py: remove unused import
Brian Warner [Sun, 26 Oct 2014 18:56:57 +0000 (11:56 -0700)]
test-osx-pkg.py: remove unused import

10 years agoMerge branch '1159-notac-4'
Brian Warner [Sun, 26 Oct 2014 18:56:05 +0000 (11:56 -0700)]
Merge branch '1159-notac-4'

10 years agoImprove error reporting and help for start/stop/etc. commands. 1159-notac-4 123/head
Daira Hopwood [Tue, 21 Oct 2014 18:15:32 +0000 (19:15 +0100)]
Improve error reporting and help for start/stop/etc. commands.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agostartstop_node.py: rename internal command and twistd plugin class used to start...
Daira Hopwood [Tue, 21 Oct 2014 18:04:14 +0000 (19:04 +0100)]
startstop_node.py: rename internal command and twistd plugin class used to start tahoe nodes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years ago'tahoe start': stop using the contents of .tac files
Brian Warner [Wed, 23 May 2012 07:19:27 +0000 (00:19 -0700)]
'tahoe start': stop using the contents of .tac files

Instead of constructing a sys.argv for 'twistd' that reads the node's
.tac file, we construct arguments that tell twistd to use a special
in-memory-only plugin that creates the desired node instance directly.

We still use the name of the .tac file to decide which kind of instance
to make (Client, IntroducerNode, KeyGenerator, StatsGatherer), but never
actually read the contents of the .tac file. Later improvements could
change this to look inside the tahoe.cfg for a nodetype= directive, etc.

This also makes it easy to have "tahoe start BASEDIR" pass the rest of
its arguments on to twistd, so e.g. "tahoe start BASEDIR --nodaemon
--profile=prof.out" does what you'd expect "twistd --nodaemon
--profile=prof.out" to do. "tahoe run BASEDIR" is thus simply aliased to
"tahoe start BASEDIR --nodaemon". This removes the need to special-case
--profile and --syslog.

I also removed some of the default logging behavior:

 before:
  'tahoe start' = 'twistd --logfile BASEDIR logs/twistd.log'
  'tahoe start --profile' adds '--profile=profiling_results.prof --savestats'
  'tahoe run' = 'twistd --nodaemon --logfile BASEDIR/logs/tahoesvc.log'

 after:
  'tahoe start' = 'twistd --logfile BASEDIR logs/twistd.log'
     unless --logfile, --nodaemon, or --syslog are passed
  'tahoe start --profile' invalid, use 'tahoe start --profile=OUTPUT'
  'tahoe run' = 'twistd --nodaemon'
     so log messages go to stdout

This finally enables 'tahoe run' to work with all node types, including
the key-generator and stats-gatherer.

It gets 'tahoe start' one step closer to accepting --reactor= . To
actually accomplish this will require this file, the enclosing
__init_.py files, and everything they import to avoid importing the
reactor. (if anything imports twisted.internet.reactor before
startstop_node.start() gets to run, then --reactor= comes too late).
That will take a lot of work, and requires lazy-loading of many core
libraries (foolscap.logging in particular), and removing a lot of code
from src/allmydata/__init__.py .

10 years agoMerge pull request #122 from tahoe-lafs/182-osx-packaging-6
Daira Hopwood [Tue, 21 Oct 2014 15:11:05 +0000 (16:11 +0100)]
Merge pull request #122 from tahoe-lafs/182-osx-packaging-6

182 osx packaging 6

10 years agomisc/build_helpers/test-osx-pkg.py: script to test the OS X pkg. 182-osx-packaging-6 122/head
Daira Hopwood [Tue, 7 Oct 2014 00:40:19 +0000 (01:40 +0100)]
misc/build_helpers/test-osx-pkg.py: script to test the OS X pkg.

After extracting the contents of the package, this script looks at the
output of 'tahoe --version-and-path' to see if the modules are installed
and invoked from the right path.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoDistribution.xml file and scripts for building the OSX package.
Ramakrishnan Muthukrishnan [Mon, 13 Oct 2014 16:01:16 +0000 (21:31 +0530)]
Distribution.xml file and scripts for building the OSX package.

10 years agoclean target should remove the pkg file.
Ramakrishnan Muthukrishnan [Fri, 3 Oct 2014 15:37:14 +0000 (21:07 +0530)]
clean target should remove the pkg file.

10 years agoNew make target for OS X package creation.
Daira Hopwood [Mon, 6 Oct 2014 22:46:29 +0000 (23:46 +0100)]
New make target for OS X package creation.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoDelete the obsolete misc/build_helpers/test_mac_diskimage.py script.
Daira Hopwood [Tue, 7 Oct 2014 00:40:58 +0000 (01:40 +0100)]
Delete the obsolete misc/build_helpers/test_mac_diskimage.py script.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoUpdate CREDITS.
Daira Hopwood [Tue, 7 Oct 2014 18:00:53 +0000 (19:00 +0100)]
Update CREDITS.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agobin/tahoe @python should always invoke the same Python that ran bin/tahoe.
Daira Hopwood [Mon, 13 Oct 2014 17:47:23 +0000 (18:47 +0100)]
bin/tahoe @python should always invoke the same Python that ran bin/tahoe.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoRemove an unused import.
Daira Hopwood [Fri, 10 Oct 2014 19:39:18 +0000 (20:39 +0100)]
Remove an unused import.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoDon't call filenode.get_size() twice. refs #1634
Daira Hopwood [Fri, 10 Oct 2014 19:36:08 +0000 (20:36 +0100)]
Don't call filenode.get_size() twice. refs #1634

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoMerge pull request #120 from zancas/1634-dont-return-none_5
zooko [Fri, 10 Oct 2014 19:16:12 +0000 (19:16 +0000)]
Merge pull request #120 from zancas/1634-dont-return-none_5

1634 dont return none 5

10 years agoDo not report 'size' metadata if get_size returns None 120/head
zancas [Fri, 10 Oct 2014 02:37:32 +0000 (20:37 -0600)]
Do not report 'size' metadata if get_size returns None

10 years agoexercise all branches of new helper "get_filenode_metadata"
zancas [Tue, 7 Oct 2014 23:36:03 +0000 (17:36 -0600)]
exercise all branches of new helper "get_filenode_metadata"

Note fix following issues from origial commit:

refactor unittests, fix style, add test

(0) use CommonFixture as mixin to increase DRYness
(1) self.failUnlessIn('size', metadata.keys()) --> self.failUnlessIn('size', metdata)
(2) test_size_is_not_None --> test_size_is_0 AND test_size_is_1000

10 years agorefactor get_filenode_metadata(...) into common.py
zancas [Tue, 7 Oct 2014 19:11:31 +0000 (13:11 -0600)]
refactor get_filenode_metadata(...) into common.py

10 years agoCorrect a comment about which version of Twisted introduces a pywin32 dependency...
Daira Hopwood [Wed, 8 Oct 2014 11:57:31 +0000 (12:57 +0100)]
Correct a comment about which version of Twisted introduces a pywin32 dependency (12.3.0, not 13.0).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoImprove comments in _auto_deps.py. refs #2249, #2028, #2193, #2005, #1258 2249-windows-dep-workaround-5 118/head
Daira Hopwood [Tue, 7 Oct 2014 20:04:40 +0000 (21:04 +0100)]
Improve comments in _auto_deps.py. refs #2249, #2028, #2193, #2005, #1258

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years agoSpecify the setuptools egg filename explicitly rather than globbing for it.
Daira Hopwood [Tue, 7 Oct 2014 18:28:53 +0000 (19:28 +0100)]
Specify the setuptools egg filename explicitly rather than globbing for it.
(Note that if the version changes in future, this will fail loudly so we'll know we have to change it.)

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years ago.travis.yml: remove workaround to install Twisted 13.0 which should no longer be...
Daira Hopwood [Mon, 29 Sep 2014 17:50:54 +0000 (18:50 +0100)]
.travis.yml: remove workaround to install Twisted 13.0 which should no longer be needed.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
10 years ago_auto_deps.py cosmetics and cleanup.
Daira Hopwood [Tue, 30 Sep 2014 18:03:25 +0000 (19:03 +0100)]
_auto_deps.py cosmetics and cleanup.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>