Date: Sat, 24 Dec 2005 16:44:09 GMT From: Yoshihiro Ota <ota@j.email.ne.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/90880: pdumpfs-rsync updated Message-ID: <200512241644.jBOGi9Uv000723@www.freebsd.org> Resent-Message-ID: <200512241650.jBOGo46U060761@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90880
>Category: ports
>Synopsis: pdumpfs-rsync updated
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 24 16:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Yoshihiro Ota
>Release: 5.4, 6.0
>Organization:
>Environment:
Independent
FreeBSD 5.4-SECURITY #0: Wed Jul 20 08:57:11 UTC 2005 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
pdumpfs has been updated but corresponding changes are not made to pdumpfs-rsync so that it doesn't work.
>How-To-Repeat:
pdumpfs-rsync host:source dist
>Fix:
The following patch includes the one in files dir, the first chunk. Now, it runs and makes a backup as it says. On the other hand, I didn't test file pattern matching part and don't know if it works.
--- pdumpfs-rsync.orig Sat Dec 24 00:22:55 2005
+++ pdumpfs-rsync Sat Dec 24 10:57:08 2005
@@ -15,7 +15,7 @@
# the GNU General Public License version 2.
#
-load '/usr/bin/pdumpfs'
+load File.join(File.dirname(__FILE__), 'pdumpfs')
require 'ftools'
require 'getoptlong'
@@ -128,8 +128,10 @@
end
end
- latest = latest_snapshot(src, dest, base)
- today = File.join(dest, datedir(Date.today), base)
+ start_time = Time.now
+ pdumpfs = Pdumpfs::Pdumpfs.new(opts)
+ latest = pdumpfs.latest_snapshot(start_time, src, dest, base)
+ today = File.join(dest, pdumpfs.datedir(Date.today), base)
rsync_array = rsync_array + rsync_opts
rsync_array.push(ARGV[0].sub(%r!/+$!, '') + '/')
rsync_array.push(src + '/')
@@ -141,7 +143,7 @@
if ( $? >> 8 != 0 )
STDERR.print "WARNING: rsync failed: #{ARGV[0]}; exit value: #{$? >> 8}\n
"
end
- update_snapshot(src, src, today, matcher)
+ pdumpfs.update_snapshot(src, src, today, matcher)
else
STDERR.print "rsync failed: #{ARGV[0]}; exit value: #{$? >> 8}\n"
exit $? >> 8
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512241644.jBOGi9Uv000723>