diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/.gitignore b/Godeps/_workspace/src/github.com/camlistore/lock/.gitignore
deleted file mode 100644
index b25c15b81fae06e1c55946ac6270bfdb293870e8..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/COPYING b/Godeps/_workspace/src/github.com/camlistore/lock/COPYING
deleted file mode 100644
index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/README.txt b/Godeps/_workspace/src/github.com/camlistore/lock/README.txt
deleted file mode 100644
index a9eeb33ded23ab8d3dfc40bc0b8f821f3373b683..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-File locking library.
-
-See http://godoc.org/github.com/camlistore/lock
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock.go
deleted file mode 100644
index 6268527b04e07cf759093f11373171567052a722..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock.go
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "encoding/json"
- "fmt"
- "io"
- "os"
- "path/filepath"
- "sync"
-)
-
-// Lock locks the given file, creating the file if necessary. If the
-// file already exists, it must have zero size or an error is returned.
-// The lock is an exclusive lock (a write lock), but locked files
-// should neither be read from nor written to. Such files should have
-// zero size and only exist to co-ordinate ownership across processes.
-//
-// A nil Closer is returned if an error occurred. Otherwise, close that
-// Closer to release the lock.
-//
-// On Linux, FreeBSD and OSX, a lock has the same semantics as fcntl(2)'s
-// advisory locks. In particular, closing any other file descriptor for the
-// same file will release the lock prematurely.
-//
-// Attempting to lock a file that is already locked by the current process
-// has undefined behavior.
-//
-// On other operating systems, lock will fallback to using the presence and
-// content of a file named name + '.lock' to implement locking behavior.
-func Lock(name string) (io.Closer, error) {
- return lockFn(name)
-}
-
-var lockFn = lockPortable
-
-// Portable version not using fcntl. Doesn't handle crashes as gracefully,
-// since it can leave stale lock files.
-// TODO: write pid of owner to lock file and on race see if pid is
-// still alive?
-func lockPortable(name string) (io.Closer, error) {
- absName, err := filepath.Abs(name)
- if err != nil {
- return nil, fmt.Errorf("can't Lock file %q: can't find abs path: %v", name, err)
- }
- fi, err := os.Stat(absName)
- if err == nil && fi.Size() > 0 {
- if isStaleLock(absName) {
- os.Remove(absName)
- } else {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
- }
- f, err := os.OpenFile(absName, os.O_RDWR|os.O_CREATE|os.O_TRUNC|os.O_EXCL, 0666)
- if err != nil {
- return nil, fmt.Errorf("failed to create lock file %s %v", absName, err)
- }
- if err := json.NewEncoder(f).Encode(&pidLockMeta{OwnerPID: os.Getpid()}); err != nil {
- return nil, err
- }
- return &lockCloser{f: f, abs: absName}, nil
-}
-
-type pidLockMeta struct {
- OwnerPID int
-}
-
-func isStaleLock(path string) bool {
- f, err := os.Open(path)
- if err != nil {
- return false
- }
- defer f.Close()
- var meta pidLockMeta
- if json.NewDecoder(f).Decode(&meta) != nil {
- return false
- }
- if meta.OwnerPID == 0 {
- return false
- }
- p, err := os.FindProcess(meta.OwnerPID)
- if err != nil {
- // e.g. on Windows
- return true
- }
- // On unix, os.FindProcess always is true, so we have to send
- // it a signal to see if it's alive.
- if signalZero != nil {
- if p.Signal(signalZero) != nil {
- return true
- }
- }
- return false
-}
-
-var signalZero os.Signal // nil or set by lock_sigzero.go
-
-type lockCloser struct {
- f *os.File
- abs string
- once sync.Once
- err error
-}
-
-func (lc *lockCloser) Close() error {
- lc.once.Do(lc.close)
- return lc.err
-}
-
-func (lc *lockCloser) close() {
- if err := lc.f.Close(); err != nil {
- lc.err = err
- }
- if err := os.Remove(lc.abs); err != nil {
- lc.err = err
- }
-}
-
-var (
- lockmu sync.Mutex
- locked = map[string]bool{} // abs path -> true
-)
-
-// unlocker is used by the darwin and linux implementations with fcntl
-// advisory locks.
-type unlocker struct {
- f *os.File
- abs string
-}
-
-func (u *unlocker) Close() error {
- lockmu.Lock()
- // Remove is not necessary but it's nice for us to clean up.
- // If we do do this, though, it needs to be before the
- // u.f.Close below.
- os.Remove(u.abs)
- if err := u.f.Close(); err != nil {
- return err
- }
- delete(locked, u.abs)
- lockmu.Unlock()
- return nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_appengine.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_appengine.go
deleted file mode 100644
index ab4cad6ab6002e4f90b19701e90bab44007b564d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_appengine.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "errors"
- "io"
-)
-
-func init() {
- lockFn = lockAppEngine
-}
-
-func lockAppEngine(name string) (io.Closer, error) {
- return nil, errors.New("Lock not available on App Engine")
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_darwin_amd64.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_darwin_amd64.go
deleted file mode 100644
index 9fea51fe876b667d3513d26640d6f7b7c455cf72..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_darwin_amd64.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build darwin,amd64
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "syscall"
- "unsafe"
-)
-
-func init() {
- lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
- abs, err := filepath.Abs(name)
- if err != nil {
- return nil, err
- }
- lockmu.Lock()
- if locked[abs] {
- lockmu.Unlock()
- return nil, fmt.Errorf("file %q already locked", abs)
- }
- locked[abs] = true
- lockmu.Unlock()
-
- fi, err := os.Stat(name)
- if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
-
- f, err := os.Create(name)
- if err != nil {
- return nil, fmt.Errorf("Lock Create of %s (abs: %s) failed: %v", name, abs, err)
- }
-
- // This type matches C's "struct flock" defined in /usr/include/sys/fcntl.h.
- // TODO: move this into the standard syscall package.
- k := struct {
- Start uint64 // sizeof(off_t): 8
- Len uint64 // sizeof(off_t): 8
- Pid uint32 // sizeof(pid_t): 4
- Type uint16 // sizeof(short): 2
- Whence uint16 // sizeof(short): 2
- }{
- Type: syscall.F_WRLCK,
- Whence: uint16(os.SEEK_SET),
- Start: 0,
- Len: 0, // 0 means to lock the entire file.
- Pid: uint32(os.Getpid()),
- }
-
- _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
- if errno != 0 {
- f.Close()
- return nil, errno
- }
- return &unlocker{f, abs}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_freebsd.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_freebsd.go
deleted file mode 100644
index d3835d62488624186355353a72f4f468c7bb1da1..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_freebsd.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "syscall"
- "unsafe"
-)
-
-func init() {
- lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
- abs, err := filepath.Abs(name)
- if err != nil {
- return nil, err
- }
- lockmu.Lock()
- if locked[abs] {
- lockmu.Unlock()
- return nil, fmt.Errorf("file %q already locked", abs)
- }
- locked[abs] = true
- lockmu.Unlock()
-
- fi, err := os.Stat(name)
- if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
-
- f, err := os.Create(name)
- if err != nil {
- return nil, err
- }
-
- // This type matches C's "struct flock" defined in /usr/include/fcntl.h.
- // TODO: move this into the standard syscall package.
- k := struct {
- Start int64 /* off_t starting offset */
- Len int64 /* off_t len = 0 means until end of file */
- Pid int32 /* pid_t lock owner */
- Type int16 /* short lock type: read/write, etc. */
- Whence int16 /* short type of l_start */
- Sysid int32 /* int remote system id or zero for local */
- }{
- Start: 0,
- Len: 0, // 0 means to lock the entire file.
- Pid: int32(os.Getpid()),
- Type: syscall.F_WRLCK,
- Whence: int16(os.SEEK_SET),
- Sysid: 0,
- }
-
- _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
- if errno != 0 {
- f.Close()
- return nil, errno
- }
- return &unlocker{f, abs}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_amd64.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_amd64.go
deleted file mode 100644
index 3a7eb00a62e8ffe7076d44c297e54ac54fba250d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_amd64.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build linux,amd64
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "syscall"
- "unsafe"
-)
-
-func init() {
- lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
- abs, err := filepath.Abs(name)
- if err != nil {
- return nil, err
- }
- lockmu.Lock()
- if locked[abs] {
- lockmu.Unlock()
- return nil, fmt.Errorf("file %q already locked", abs)
- }
- locked[abs] = true
- lockmu.Unlock()
-
- fi, err := os.Stat(name)
- if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
-
- f, err := os.Create(name)
- if err != nil {
- return nil, err
- }
-
- // This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
- // TODO: move this into the standard syscall package.
- k := struct {
- Type uint32
- Whence uint32
- Start uint64
- Len uint64
- Pid uint32
- }{
- Type: syscall.F_WRLCK,
- Whence: uint32(os.SEEK_SET),
- Start: 0,
- Len: 0, // 0 means to lock the entire file.
- Pid: uint32(os.Getpid()),
- }
-
- _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(syscall.F_SETLK), uintptr(unsafe.Pointer(&k)))
- if errno != 0 {
- f.Close()
- return nil, errno
- }
- return &unlocker{f, abs}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_arm.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_arm.go
deleted file mode 100644
index c2a0a102e960175c3b8ad82de5db82934e196355..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_linux_arm.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// +build linux,arm
-// +build !appengine
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "syscall"
- "unsafe"
-)
-
-func init() {
- lockFn = lockFcntl
-}
-
-func lockFcntl(name string) (io.Closer, error) {
- abs, err := filepath.Abs(name)
- if err != nil {
- return nil, err
- }
- lockmu.Lock()
- if locked[abs] {
- lockmu.Unlock()
- return nil, fmt.Errorf("file %q already locked", abs)
- }
- locked[abs] = true
- lockmu.Unlock()
-
- fi, err := os.Stat(name)
- if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
-
- f, err := os.Create(name)
- if err != nil {
- return nil, err
- }
-
- // This type matches C's "struct flock" defined in /usr/include/bits/fcntl.h.
- // TODO: move this into the standard syscall package.
- k := struct {
- Type uint16
- Whence uint16
- Start uint32
- Len uint32
- Pid uint32
- }{
- Type: syscall.F_WRLCK,
- Whence: uint16(os.SEEK_SET),
- Start: 0,
- Len: 0, // 0 means to lock the entire file.
- Pid: uint32(os.Getpid()),
- }
-
- const F_SETLK = 6 // actual value. syscall package is wrong: golang.org/issue/7059
- _, _, errno := syscall.Syscall(syscall.SYS_FCNTL, f.Fd(), uintptr(F_SETLK), uintptr(unsafe.Pointer(&k)))
- if errno != 0 {
- f.Close()
- return nil, errno
- }
- return &unlocker{f, abs}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_plan9.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_plan9.go
deleted file mode 100644
index bdf4e229284209cb5f9ee88c3358dd7971944de4..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_plan9.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
-)
-
-func init() {
- lockFn = lockPlan9
-}
-
-func lockPlan9(name string) (io.Closer, error) {
- var f *os.File
- abs, err := filepath.Abs(name)
- if err != nil {
- return nil, err
- }
- lockmu.Lock()
- if locked[abs] {
- lockmu.Unlock()
- return nil, fmt.Errorf("file %q already locked", abs)
- }
- locked[abs] = true
- lockmu.Unlock()
-
- fi, err := os.Stat(name)
- if err == nil && fi.Size() > 0 {
- return nil, fmt.Errorf("can't Lock file %q: has non-zero size", name)
- }
-
- f, err = os.OpenFile(name, os.O_RDWR|os.O_CREATE, os.ModeExclusive|0644)
- if err != nil {
- return nil, fmt.Errorf("Lock Create of %s (abs: %s) failed: %v", name, abs, err)
- }
-
- return &unlocker{f, abs}, nil
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_sigzero.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_sigzero.go
deleted file mode 100644
index fd3ba2db19769ff1bab55ce634924bf57c7ef743..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_sigzero.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build !appengine
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import "syscall"
-
-func init() {
- signalZero = syscall.Signal(0)
-}
diff --git a/Godeps/_workspace/src/github.com/camlistore/lock/lock_test.go b/Godeps/_workspace/src/github.com/camlistore/lock/lock_test.go
deleted file mode 100644
index 518d2f025fe17fbb7f84b80d5059292d069a4e20..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/camlistore/lock/lock_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright 2013 The Go Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lock
-
-import (
- "fmt"
- "io/ioutil"
- "log"
- "os"
- "os/exec"
- "path/filepath"
- "strconv"
- "testing"
-)
-
-func TestLock(t *testing.T) {
- testLock(t, false)
-}
-
-func TestLockPortable(t *testing.T) {
- testLock(t, true)
-}
-
-func TestLockInChild(t *testing.T) {
- f := os.Getenv("TEST_LOCK_FILE")
- if f == "" {
- // not child
- return
- }
- lock := Lock
- if v, _ := strconv.ParseBool(os.Getenv("TEST_LOCK_PORTABLE")); v {
- lock = lockPortable
- }
-
- lk, err := lock(f)
- if err != nil {
- log.Fatalf("Lock failed: %v", err)
- }
-
- if v, _ := strconv.ParseBool(os.Getenv("TEST_LOCK_CRASH")); v {
- // Simulate a crash, or at least not unlocking the
- // lock. We still exit 0 just to simplify the parent
- // process exec code.
- os.Exit(0)
- }
- lk.Close()
-}
-
-func testLock(t *testing.T, portable bool) {
- lock := Lock
- if portable {
- lock = lockPortable
- }
-
- td, err := ioutil.TempDir("", "")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(td)
-
- path := filepath.Join(td, "foo.lock")
-
- childLock := func(crash bool) error {
- cmd := exec.Command(os.Args[0], "-test.run=LockInChild$")
- cmd.Env = []string{"TEST_LOCK_FILE=" + path}
- if portable {
- cmd.Env = append(cmd.Env, "TEST_LOCK_PORTABLE=1")
- }
- if crash {
- cmd.Env = append(cmd.Env, "TEST_LOCK_CRASH=1")
- }
- out, err := cmd.CombinedOutput()
- t.Logf("Child output: %q (err %v)", out, err)
- if err != nil {
- return fmt.Errorf("Child Process lock of %s failed: %v %s", path, err, out)
- }
- return nil
- }
-
- t.Logf("Locking in crashing child...")
- if err := childLock(true); err != nil {
- t.Fatalf("first lock in child process: %v", err)
- }
-
- t.Logf("Locking+unlocking in child...")
- if err := childLock(false); err != nil {
- t.Fatalf("lock in child process after crashing child: %v", err)
- }
-
- t.Logf("Locking in parent...")
- lk1, err := lock(path)
- if err != nil {
- t.Fatal(err)
- }
-
- t.Logf("Again in parent...")
- _, err = lock(path)
- if err == nil {
- t.Fatal("expected second lock to fail")
- }
-
- t.Logf("Locking in child...")
- if childLock(false) == nil {
- t.Fatalf("expected lock in child process to fail")
- }
-
- t.Logf("Unlocking lock in parent")
- if err := lk1.Close(); err != nil {
- t.Fatal(err)
- }
-
- lk3, err := lock(path)
- if err != nil {
- t.Fatal(err)
- }
- lk3.Close()
-}
diff --git a/package.json b/package.json
index b9b9491f050f027d7d40dd7e9d693cced6644b4f..58120d824191005a7a36d0acfd872aa2fd339682 100644
--- a/package.json
+++ b/package.json
@@ -159,6 +159,12 @@
"hash": "QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy",
"name": "golang-lru",
"version": "0.0.0"
+ },
+ {
+ "author": "whyrusleeping",
+ "hash": "QmWi28zbQG6B1xfaaWx5cYoLn3kBFU6pQ6GWQNRV5P6dNe",
+ "name": "lock",
+ "version": "0.0.0"
}
],
"gxVersion": "0.4.0",
diff --git a/repo/fsrepo/lock/lock.go b/repo/fsrepo/lock/lock.go
index 1e7b5b081cac5c4f832d21ef2067ff629a3eb51d..4c4553d01a145f63d02f13bee6105eee50e54628 100644
--- a/repo/fsrepo/lock/lock.go
+++ b/repo/fsrepo/lock/lock.go
@@ -8,7 +8,7 @@ import (
"strings"
"syscall"
- lock "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/camlistore/lock"
+ lock "gx/ipfs/QmWi28zbQG6B1xfaaWx5cYoLn3kBFU6pQ6GWQNRV5P6dNe/lock"
logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
"gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
)
@@ -25,8 +25,7 @@ func errPerm(path string) error {
}
func Lock(confdir string) (io.Closer, error) {
- c, err := lock.Lock(path.Join(confdir, LockFile))
- return c, err
+ return lock.Lock(path.Join(confdir, LockFile))
}
func Locked(confdir string) (bool, error) {
@@ -41,7 +40,7 @@ func Locked(confdir string) (bool, error) {
log.Debugf("Someone else has the lock: %s", path.Join(confdir, LockFile))
return true, nil
}
- if strings.Contains(err.Error(), "can't Lock file") {
+ if strings.Contains(err.Error(), "resource temporarily unavailable") {
log.Debugf("Can't lock file: %s.\n reason: %s", path.Join(confdir, LockFile), err.Error())
return true, nil
}