← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/utils/file_unix.go

Committer: Package Import Robot
Author(s): James Page
Date: 2014-04-12 07:04:37 UTC
mfrom: (1.1.23)
Revision ID: package-import@ubuntu.com-20140412070437-jub6rry6bdr9rqw1

Tags: 1.18.1-0ubuntu1

https://launchpad.net/bugs/1299802

https://launchpad.net/bugs/1303697

https://launchpad.net/bugs/1303735

https://launchpad.net/bugs/1303880

https://launchpad.net/bugs/1306208

https://launchpad.net/bugs/1306296

* New upstream point release, including fixes for:
  - Upgrading juju 1.16.6 -> 1.18.x fails (LP: #1299802).
  - Peer relation disappears during juju-upgrade (LP: #1303697).
  - public-address of units changes to internal bridge post upgrade
    (LP: #1303735).
  - Unable to deploy local charms without series (LP: #1303880).
  - juju scp no longer allows multiple extra arguments to be passed
    (LP: #1306208).
  - juju cannot downgrade to same major.minor version with earlier
    patch number (LP: #1306296).

files added:
src/code.google.com/p/go.net/html/charset

src/code.google.com/p/go.net/html/charset/charset.go

src/code.google.com/p/go.net/html/charset/charset_test.go

src/code.google.com/p/go.net/html/charset/gen.go

src/code.google.com/p/go.net/html/charset/table.go

src/code.google.com/p/go.net/html/charset/testdata

src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html

src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html

src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html

src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html

src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html

src/code.google.com/p/go.net/html/charset/testdata/README

src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html

src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html

src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html

src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html

src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html

src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html

src/code.google.com/p/go.net/ipv4/control_stub.go

src/code.google.com/p/go.net/ipv4/dgramopt_stub.go

src/code.google.com/p/go.net/ipv4/genericopt_stub.go

src/code.google.com/p/go.net/ipv4/helper_stub.go

src/code.google.com/p/go.net/ipv4/sockopt_stub.go

src/code.google.com/p/go.net/ipv4/sys_freebsd.go

src/code.google.com/p/go.net/ipv6/control_rfc2292_unix.go

src/code.google.com/p/go.net/ipv6/control_rfc3542_stub.go

src/code.google.com/p/go.net/ipv6/control_rfc3542_unix.go

src/code.google.com/p/go.net/ipv6/dgramopt_stub.go

src/code.google.com/p/go.net/ipv6/genericopt_stub.go

src/code.google.com/p/go.net/ipv6/helper_stub.go

src/code.google.com/p/go.net/ipv6/icmp_stub.go

src/code.google.com/p/go.net/ipv6/readwrite_test.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_unix.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_stub.go

src/code.google.com/p/go.net/ipv6/sys.go

src/code.google.com/p/go.net/ipv6/sys_bsd.go

src/code.google.com/p/go.net/ipv6/sys_darwin.go

src/code.google.com/p/go.net/ipv6/sys_linux.go

src/code.google.com/p/go.net/ipv6/sys_unix.go

src/code.google.com/p/go.net/ipv6/sys_windows.go

src/code.google.com/p/go.net/ipv6/syscall_linux_386.go

src/code.google.com/p/go.net/ipv6/syscall_linux_386.s

src/code.google.com/p/go.net/ipv6/syscall_nosplit4_linux_386.go

src/code.google.com/p/go.net/ipv6/syscall_nosplit7_linux_386.go

src/code.google.com/p/go.net/ipv6/syscall_unix.go

src/code.google.com/p/go.net/netutil

src/code.google.com/p/go.net/netutil/listen.go

src/code.google.com/p/go.net/netutil/listen_test.go

src/launchpad.net/juju-core/testing/filetesting

src/launchpad.net/juju-core/testing/filetesting/filetesting.go

src/launchpad.net/juju-core/testing/filetesting/filetesting_test.go

src/launchpad.net/juju-core/testing/filetesting/package_test.go

files removed:
src/code.google.com/p/go.net/ipv4/control_plan9.go

src/code.google.com/p/go.net/ipv4/dgramopt_plan9.go

src/code.google.com/p/go.net/ipv4/genericopt_plan9.go

src/code.google.com/p/go.net/ipv4/helper_plan9.go

src/code.google.com/p/go.net/ipv4/sockopt_plan9.go

src/code.google.com/p/go.net/ipv6/control_rfc2292_darwin.go

src/code.google.com/p/go.net/ipv6/control_rfc3542_bsd.go

src/code.google.com/p/go.net/ipv6/control_rfc3542_linux.go

src/code.google.com/p/go.net/ipv6/control_rfc3542_plan9.go

src/code.google.com/p/go.net/ipv6/control_test.go

src/code.google.com/p/go.net/ipv6/dgramopt_plan9.go

src/code.google.com/p/go.net/ipv6/genericopt_plan9.go

src/code.google.com/p/go.net/ipv6/helper_plan9.go

src/code.google.com/p/go.net/ipv6/icmp_plan9.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc2292_darwin.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_bsd.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_linux.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_plan9.go

src/code.google.com/p/go.net/websocket/hixie.go

src/code.google.com/p/go.net/websocket/hixie_test.go

files modified:
debian/changelog

src/code.google.com/p/go.net/.hgignore

src/code.google.com/p/go.net/codereview.cfg

src/code.google.com/p/go.net/html/token.go

src/code.google.com/p/go.net/html/token_test.go

src/code.google.com/p/go.net/ipv4/gen.go

src/code.google.com/p/go.net/ipv4/gentest.go

src/code.google.com/p/go.net/ipv4/header.go

src/code.google.com/p/go.net/ipv4/header_test.go

src/code.google.com/p/go.net/ipv4/helper.go

src/code.google.com/p/go.net/ipv4/iana_test.go

src/code.google.com/p/go.net/ipv4/mocktransponder_test.go

src/code.google.com/p/go.net/ipv4/multicastlistener_test.go

src/code.google.com/p/go.net/ipv4/packet.go

src/code.google.com/p/go.net/ipv6/control.go

src/code.google.com/p/go.net/ipv6/gen.go

src/code.google.com/p/go.net/ipv6/gentest.go

src/code.google.com/p/go.net/ipv6/helper.go

src/code.google.com/p/go.net/ipv6/iana.go

src/code.google.com/p/go.net/ipv6/iana_test.go

src/code.google.com/p/go.net/ipv6/icmp.go

src/code.google.com/p/go.net/ipv6/icmp_bsd.go

src/code.google.com/p/go.net/ipv6/icmp_linux.go

src/code.google.com/p/go.net/ipv6/icmp_test.go

src/code.google.com/p/go.net/ipv6/icmp_windows.go

src/code.google.com/p/go.net/ipv6/mockicmp_test.go

src/code.google.com/p/go.net/ipv6/mocktransponder_test.go

src/code.google.com/p/go.net/ipv6/multicast_test.go

src/code.google.com/p/go.net/ipv6/multicastlistener_test.go

src/code.google.com/p/go.net/ipv6/multicastsockopt_test.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_bsd.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_linux.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_unix.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3493_windows.go

src/code.google.com/p/go.net/ipv6/sockopt_rfc3542_unix.go

src/code.google.com/p/go.net/ipv6/sockopt_test.go

src/code.google.com/p/go.net/ipv6/unicast_test.go

src/code.google.com/p/go.net/ipv6/unicastsockopt_test.go

src/code.google.com/p/go.net/proxy/proxy.go

src/code.google.com/p/go.net/publicsuffix/gen.go

src/code.google.com/p/go.net/publicsuffix/list_test.go

src/code.google.com/p/go.net/publicsuffix/table.go

src/code.google.com/p/go.net/publicsuffix/table_test.go

src/code.google.com/p/go.net/websocket/client.go

src/code.google.com/p/go.net/websocket/hybi.go

src/code.google.com/p/go.net/websocket/hybi_test.go

src/code.google.com/p/go.net/websocket/server.go

src/code.google.com/p/go.net/websocket/websocket.go

src/code.google.com/p/go.net/websocket/websocket_test.go

src/launchpad.net/juju-core/CONTRIBUTING

src/launchpad.net/juju-core/cmd/juju/common.go

src/launchpad.net/juju-core/cmd/juju/deploy.go

src/launchpad.net/juju-core/cmd/juju/scp.go

src/launchpad.net/juju-core/cmd/juju/scp_test.go

src/launchpad.net/juju-core/cmd/juju/status_test.go

src/launchpad.net/juju-core/cmd/plugins/juju-restore/restore.go

src/launchpad.net/juju-core/dependencies.tsv

src/launchpad.net/juju-core/environs/manual/addresses_test.go

src/launchpad.net/juju-core/instance/address.go

src/launchpad.net/juju-core/instance/address_test.go

src/launchpad.net/juju-core/provider/local/environprovider.go

src/launchpad.net/juju-core/provider/maas/instance.go

src/launchpad.net/juju-core/provider/openstack/provider.go

src/launchpad.net/juju-core/provider/openstack/provider_test.go

src/launchpad.net/juju-core/scripts/win-installer/setup.iss

src/launchpad.net/juju-core/state/api/agent/state.go

src/launchpad.net/juju-core/state/api/common/life.go

src/launchpad.net/juju-core/state/api/deployer/machine.go

src/launchpad.net/juju-core/state/api/firewaller/machine.go

src/launchpad.net/juju-core/state/api/firewaller/service.go

src/launchpad.net/juju-core/state/api/firewaller/unit.go

src/launchpad.net/juju-core/state/api/keyupdater/authorisedkeys.go

src/launchpad.net/juju-core/state/api/logger/logger.go

src/launchpad.net/juju-core/state/api/machiner/machine.go

src/launchpad.net/juju-core/state/api/machiner/machiner_test.go

src/launchpad.net/juju-core/state/api/params/params.go

src/launchpad.net/juju-core/state/api/provisioner/machine.go

src/launchpad.net/juju-core/state/api/provisioner/provisioner.go

src/launchpad.net/juju-core/state/api/uniter/charm.go

src/launchpad.net/juju-core/state/api/uniter/relationunit.go

src/launchpad.net/juju-core/state/api/uniter/service.go

src/launchpad.net/juju-core/state/api/uniter/unit.go

src/launchpad.net/juju-core/state/api/uniter/unit_test.go

src/launchpad.net/juju-core/state/api/uniter/uniter.go

src/launchpad.net/juju-core/state/api/upgrader/upgrader.go

src/launchpad.net/juju-core/state/apiserver/machine/machiner.go

src/launchpad.net/juju-core/state/apiserver/uniter/uniter.go

src/launchpad.net/juju-core/state/apiserver/uniter/uniter_test.go

src/launchpad.net/juju-core/state/machine.go

src/launchpad.net/juju-core/state/machine_test.go

src/launchpad.net/juju-core/state/testing/agent.go

src/launchpad.net/juju-core/state/unit.go

src/launchpad.net/juju-core/state/unit_test.go

src/launchpad.net/juju-core/store/server_test.go

src/launchpad.net/juju-core/store/store_test.go

src/launchpad.net/juju-core/utils/file_test.go

src/launchpad.net/juju-core/utils/file_unix.go

src/launchpad.net/juju-core/utils/file_windows.go

src/launchpad.net/juju-core/utils/ssh/ssh.go

src/launchpad.net/juju-core/utils/ssh/ssh_gocrypto.go

src/launchpad.net/juju-core/utils/ssh/ssh_gocrypto_test.go

src/launchpad.net/juju-core/utils/ssh/ssh_openssh.go

src/launchpad.net/juju-core/utils/ssh/ssh_test.go

src/launchpad.net/juju-core/version/version.go

src/launchpad.net/juju-core/worker/machiner/machiner.go

src/launchpad.net/juju-core/worker/machiner/machiner_test.go

src/launchpad.net/juju-core/worker/peergrouper/worker_test.go

src/launchpad.net/juju-core/worker/uniter/modes.go

src/launchpad.net/juju-core/worker/uniter/relationer.go

src/launchpad.net/juju-core/worker/uniter/relationer_test.go

src/launchpad.net/juju-core/worker/uniter/uniter.go

src/launchpad.net/juju-core/worker/uniter/uniter_test.go

src/launchpad.net/juju-core/worker/upgrader/export_test.go

src/launchpad.net/juju-core/worker/upgrader/upgrader.go

src/launchpad.net/juju-core/worker/upgrader/upgrader_test.go

Show diffs side-by-side

added added

removed removed

src/launchpad.net/juju-core/utils/file_unix.go

6

6

7

7

import (

8

8

"os"

9

"syscall"

9

10

)

10

11

11

12

// ReplaceFile atomically replaces the destination file or directory

14

15

func ReplaceFile(source, destination string) error {

15

16

return os.Rename(source, destination)

16

17

}

18

19

// IsNotExist returns true if the error is consistent with an attempt to

20

// reference a file that does not exist. This works around the occasionally

21

// unhelpful behaviour of os.IsNotExist, which does not recognise the error

22

// produced when trying to read a path in which some component appears to

23

// reference a directory but actually references a file. For example, if

24

// "foo" is a file, an attempt to read "foo/bar" will generate an error that

25

// does not satisfy os.IsNotExist, but will satisfy utils.IsNotExist.

26

func IsNotExist(err error) bool {

27

if os.IsNotExist(err) {

28

return true

29

}

30

if e, ok := err.(*os.PathError); ok && e.Err == syscall.ENOTDIR {

31

return true

32

}

33

return false

34

}

Older »