From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 24 04:00:40 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C624916A445 for ; Mon, 24 Apr 2006 04:00:40 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A65D43D48 for ; Mon, 24 Apr 2006 04:00:40 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3O40eQT003683 for ; Mon, 24 Apr 2006 04:00:40 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3O40d8x003682; Mon, 24 Apr 2006 04:00:40 GMT (envelope-from gnats) Resent-Date: Mon, 24 Apr 2006 04:00:40 GMT Resent-Message-Id: <200604240400.k3O40d8x003682@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yoshisato YANAGISAWA Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FD4716A46B for ; Mon, 24 Apr 2006 03:51:25 +0000 (UTC) (envelope-from yanagisawa@frodo.csg.is.titech.ac.jp) Received: from frodo.csg.is.titech.ac.jp (frodo.csg.is.titech.ac.jp [131.112.40.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id A044A43D48 for ; Mon, 24 Apr 2006 03:51:24 +0000 (GMT) (envelope-from yanagisawa@frodo.csg.is.titech.ac.jp) Received: from frodo.csg.is.titech.ac.jp (localhost [127.0.0.1]) by frodo.csg.is.titech.ac.jp (8.13.6/8.13.4) with ESMTP id k3O3pLXl061396 for ; Mon, 24 Apr 2006 12:51:21 +0900 (JST) (envelope-from yanagisawa@frodo.csg.is.titech.ac.jp) Received: (from yanagisawa@localhost) by frodo.csg.is.titech.ac.jp (8.13.6/8.13.1/Submit) id k3O3pKVj061390; Mon, 24 Apr 2006 12:51:20 +0900 (JST) (envelope-from yanagisawa) Message-Id: <200604240351.k3O3pKVj061390@frodo.csg.is.titech.ac.jp> Date: Mon, 24 Apr 2006 12:51:20 +0900 (JST) From: Yoshisato YANAGISAWA To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96245: pdumpfs-rsync doesn't work. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yoshisato YANAGISAWA List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 04:00:41 -0000 >Number: 96245 >Category: ports >Synopsis: pdumpfs-rsync doesn't work. >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Apr 24 04:00:38 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Yoshisato YANAGISAWA >Release: FreeBSD 6.1-RC i386 >Organization: Tokyo Institute of Technology. >Environment: System: FreeBSD frodo.csg.is.titech.ac.jp 6.1-RC FreeBSD 6.1-RC #85: Wed Apr 19 11:41:59 JST 2006 yanagisawa@frodo.csg.is.titech.ac.jp:/usr/obj/usr/src/sys/FRODO i386 >Description: Pdumpfs-rsync is a remote back up program based on pdumpfs. Pdumpfs is a differential back up program for local files written in ruby. Pdumpfs-rsync in a port has two problems: - it supports old pdumpfs, which is not in a port any more, - a position of rsync is wrong. >How-To-Repeat: Just install pdumpfs-rsync from a port and execute it. >Fix: Use a following patch to change the position of rsync and support latest pdumpfs. diff -Nruip /usr/ports/sysutils/pdumpfs-rsync/files/patch-pdumpfs-rsync pdumpfs-rsync/files/patch-pdumpfs-rsync --- /usr/ports/sysutils/pdumpfs-rsync/files/patch-pdumpfs-rsync Mon Dec 26 10:37:29 2005 +++ pdumpfs-rsync/files/patch-pdumpfs-rsync Mon Apr 24 12:25:48 2006 @@ -1,5 +1,11 @@ ---- pdumpfs-rsync.orig Mon Dec 26 12:31:35 2005 -+++ pdumpfs-rsync Mon Dec 26 12:33:21 2005 +--- pdumpfs-rsync.orig Mon Apr 24 11:58:50 2006 ++++ pdumpfs-rsync Mon Apr 24 11:59:49 2006 +@@ -1,4 +1,4 @@ +-#!/usr/bin/ruby ++#!/usr/local/bin/ruby18 + # + # pdumpfs-rsync: remote pdumpfs using rsync + # @@ -15,7 +15,7 @@ # the GNU General Public License version 2. # @@ -9,7 +15,16 @@ require 'ftools' require 'getoptlong' -@@ -128,8 +128,10 @@ +@@ -110,7 +110,7 @@ end + + def main + src, dest, base, matcher, rsync_opts, opts = parse_options +- rsync_array = ['/usr/bin/rsync', ++ rsync_array = ['/usr/local/bin/rsync', + '-avH', + '--delete', + '--delete-excluded', +@@ -128,8 +128,10 @@ def main end end @@ -22,12 +37,16 @@ rsync_array = rsync_array + rsync_opts rsync_array.push(ARGV[0].sub(%r!/+$!, '') + '/') rsync_array.push(src + '/') -@@ -141,7 +143,7 @@ +@@ -141,7 +143,11 @@ def main 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) ++ if latest ++ pdumpfs.update_snapshot(src, latest, today) ++ else ++ pdumpfs.recursive_copy(src, today) ++ end else STDERR.print "rsync failed: #{ARGV[0]}; exit value: #{$? >> 8}\n" exit $? >> 8 >Release-Note: >Audit-Trail: >Unformatted: