diff options
Diffstat (limited to 'backup/pdumpfs/files')
-rw-r--r-- | backup/pdumpfs/files/pdumpfs-in.patch | 40 | ||||
-rw-r--r-- | backup/pdumpfs/files/pdumpfs-test.patch | 12 |
2 files changed, 52 insertions, 0 deletions
diff --git a/backup/pdumpfs/files/pdumpfs-in.patch b/backup/pdumpfs/files/pdumpfs-in.patch new file mode 100644 index 000000000000..cddfb995918a --- /dev/null +++ b/backup/pdumpfs/files/pdumpfs-in.patch @@ -0,0 +1,40 @@ +patch by proxy maintainer, P. Healy, April 2015 +# Bug 509960 +--- pdumpfs.in_orig 2004-12-21 02:43:12.000000000 +0000 ++++ pdumpfs.in 2015-04-01 10:58:22.671131947 +0100 +@@ -48,7 +48,7 @@ + # + + require 'find' +-require 'ftools' ++require 'fileutils' + require 'getoptlong' + require 'date' + +@@ -868,7 +868,7 @@ + today = File.join(dest, datedir(start_time), base) + + File.umask(0077) +- File.mkpath(today) unless @dry_run ++ FileUtils.mkpath(today) unless @dry_run + if latest + update_snapshot(src, latest, today) + else +@@ -1018,7 +1018,7 @@ + + case type + when "directory" +- File.mkpath(today) ++ FileUtils.mkpath(today) + when "unchanged" + File.force_link(latest, today) + when "updated" +@@ -1089,7 +1089,7 @@ + + case type + when "directory" +- File.mkpath(t) ++ FileUtils.mkpath(t) + when "new_file" + copy(s, t) + when "symlink" diff --git a/backup/pdumpfs/files/pdumpfs-test.patch b/backup/pdumpfs/files/pdumpfs-test.patch new file mode 100644 index 000000000000..e81e8b0f2d8a --- /dev/null +++ b/backup/pdumpfs/files/pdumpfs-test.patch @@ -0,0 +1,12 @@ +patch by proxy maintainer, P. Healy, April 2015 +# Bug 509960 +--- tests/pdumpfs-test_orig 2004-08-10 07:54:28.000000000 +0100 ++++ tests/pdumpfs-test 2015-04-01 11:24:35.948633870 +0100 +@@ -17,6 +17,7 @@ + + ../pdumpfs src dest > tmp.log || exit 1 + diff -r src dest/$today/src || exit 1 ++mkdir -p dest/$yesterday && rmdir dest/$yesterday + mv dest/$today dest/$yesterday + + echo update > src/foo |