diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2014-07-02 13:37:23 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2014-07-02 13:37:23 +0100 |
| commit | e56694821380961aec0e55258ac343320f5050a3 (patch) | |
| tree | 87b4a474ee55bcadf76467166ae4efd2d9f31c32 | |
| parent | 1b0f1e1fcd32df9f475307a86ad79460d983e58c (diff) | |
| parent | 4ce8b13d4e900698e30b797780fe7a971db57df5 (diff) | |
Merge branch 'master' of ssh://dev/home/git/byteback
| -rwxr-xr-x | byteback-backup | 2 | ||||
| -rwxr-xr-x | byteback-snapshot | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/byteback-backup b/byteback-backup index 346dd5d..b5050bc 100755 --- a/byteback-backup +++ b/byteback-backup @@ -107,7 +107,7 @@ rescue => err end # Check the lockfile first -if Dir.exists?(File.dirname(@lockfile)) +if File.directory?(File.dirname(@lockfile)) if File.exists? @lockfile # check the lockfile is sane exist_pid = File.read(@lockfile).to_i diff --git a/byteback-snapshot b/byteback-snapshot index 5a7b8e8..1960085 100755 --- a/byteback-snapshot +++ b/byteback-snapshot @@ -150,7 +150,7 @@ class BackupDirectory protected def system_no_error(*args) - args += " > /dev/null" unless @verbose + args[-1] += " > /dev/null" unless @verbose raise RuntimeError.new("Command failed: "+args.join(" ")) unless system(*args) end diff --git a/debian/changelog b/debian/changelog index 51bd8ed..28ab08e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +byteback (0.2.4-1) stable; urgency=medium + + * Fixed a bug[?] with byteback-snapshot + + -- James Hannah <james.hannah@bytemark.co.uk> Wed, 02 Jul 2014 10:58:22 +0100 + +byteback (0.2.3-1) stable; urgency=medium + + * Added lockfile to stop >1 backup running at once + + -- James Hannah <james.hannah@bytemark.co.uk> Wed, 02 Jul 2014 10:19:11 +0100 + byteback (0.2.2-1) stable; urgency=medium * Updated byteback not to use --one-filesystem flag. |