NetBSD Problem Report #46962

From dholland@netbsd.org  Sun Sep 16 03:15:34 2012
Return-Path: <dholland@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	by www.NetBSD.org (Postfix) with ESMTP id 4A8F763BA3B
	for <gnats-bugs@gnats.NetBSD.org>; Sun, 16 Sep 2012 03:15:34 +0000 (UTC)
Message-Id: <20120916031534.37D1314A13B@mail.netbsd.org>
Date: Sun, 16 Sep 2012 03:15:34 +0000 (UTC)
From: dholland@netbsd.org
Reply-To: dholland@netbsd.org
To: gnats-bugs@gnats.NetBSD.org
Subject: unreasonable failure of pkgdiff
X-Send-Pr-Version: 3.95

>Number:         46962
>Category:       pkg
>Synopsis:       unreasonable failure of pkgdiff
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 16 03:20:00 +0000 2012
>Closed-Date:    Sun Sep 16 18:15:44 +0000 2012
>Last-Modified:  Sun Sep 16 18:15:44 +0000 2012
>Originator:     David A. Holland
>Release:        NetBSD 6.99.7 (20120524) pkgsrc 20120915
>Organization:
>Environment:
System: NetBSD valkyrie 6.99.7 NetBSD 6.99.7 (VALKYRIE) #5: Thu May 24 23:36:41 EDT 2012  root@valkyrie:/usr/src/sys/arch/amd64/compile/VALKYRIE amd64
Architecture: x86_64
Machine: amd64
>Description:

pkgdiff fails on the following two files:

valkyrie% pkgdiff test.c.orig test.c
Cannot strip away RCS IDs, please handle manually!
Exit 1

even though (or perhaps because) the diff does not include RCS IDs.

>How-To-Repeat:

   --- test.c.orig ---
static char id[] = "$Revision: 1.1 $";

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int a = 1;
int b = 2;
int c = 3;
   --- test.c ---
static char id[] = "$Revision: 1.1 $";

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int foo;

int a = 1;
int b = 2;
int c = 3;
   ------

>Fix:

dunno.

>Release-Note:

>Audit-Trail:
From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/46962: unreasonable failure of pkgdiff
Date: Sun, 16 Sep 2012 13:16:26 +0900

 On Sun, 16 Sep 2012 12:20:01 +0900, <dholland@netbsd.org> wrote:

 > valkyrie% pkgdiff test.c.orig test.c
 > Cannot strip away RCS IDs, please handle manually!
 > Exit 1
 >
 > even though (or perhaps because) the diff does not include RCS IDs.

 > static char id[] = "$Revision: 1.1 $";

 >> Fix:
 >
 > dunno.

 Just replace message "RCS IDs" with "RCS KEYWORDs" in pkgdiff?

 -- 
 OBATA Akio / obache@NetBSD.org

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/46962: unreasonable failure of pkgdiff
Date: Sun, 16 Sep 2012 04:53:04 +0000

 On Sun, Sep 16, 2012 at 04:20:05AM +0000, OBATA Akio wrote:
  >  > dunno.
  >  
  >  Just replace message "RCS IDs" with "RCS KEYWORDs" in pkgdiff?

 How will that fix it?

 -- 
 David A. Holland
 dholland@netbsd.org

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/46962: unreasonable failure of pkgdiff
Date: Sun, 16 Sep 2012 05:12:17 +0000

 On Sun, Sep 16, 2012 at 04:55:02AM +0000, David Holland wrote:
  >  On Sun, Sep 16, 2012 at 04:20:05AM +0000, OBATA Akio wrote:
  >   >  > dunno.
  >   >  
  >   >  Just replace message "RCS IDs" with "RCS KEYWORDs" in pkgdiff?
  >  
  >  How will that fix it?

 oh, I think you probably misread - the problem is that it doesn't
 produce a diff.

 -- 
 David A. Holland
 dholland@netbsd.org

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/46962: unreasonable failure of pkgdiff
Date: Sun, 16 Sep 2012 19:49:57 +0900

 On Sun, 16 Sep 2012 14:15:04 +0900, David Holland <dholland-pbugs@netbsd.org> wrote:

 >  oh, I think you probably misread - the problem is that it doesn't
 >  produce a diff.

 default PKGDIFF_FMT contains `-p', so generated diff will be:

 --- test.c.orig 2012-09-16 10:41:12.000000000 +0000
 +++ test.c      2012-09-16 10:41:07.000000000 +0000
 @@ -4,6 +4,8 @@ static char id[] = "$Revision: 1.1 $";
   #include <stdlib.h>
   #include <string.h>

 +int foo;
 +
   int a = 1;
   int b = 2;
   int c = 3;


 -- 
 OBATA Akio / obache@NetBSD.org

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/46962: unreasonable failure of pkgdiff
Date: Sun, 16 Sep 2012 17:48:50 +0000

 On Sun, Sep 16, 2012 at 10:55:03AM +0000, OBATA Akio wrote:
  >  >  oh, I think you probably misread - the problem is that it doesn't
  >  >  produce a diff.
  >  
  >  default PKGDIFF_FMT contains `-p', so generated diff will be:

 Oops, I totally forgot that. Preparing a fix...

 -- 
 David A. Holland
 dholland@netbsd.org

From: "David A. Holland" <dholland@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/46962 CVS commit: pkgsrc/pkgtools/pkgdiff
Date: Sun, 16 Sep 2012 18:09:53 +0000

 Module Name:	pkgsrc
 Committed By:	dholland
 Date:		Sun Sep 16 18:09:53 UTC 2012

 Modified Files:
 	pkgsrc/pkgtools/pkgdiff: Makefile
 	pkgsrc/pkgtools/pkgdiff/files: pkgdiff

 Log Message:
 Drop back to diff without -p before giving up because of rcsids appearing
 in the diff output. Also, improve the error message that occurs if this
 also fails. Fixes PR 46962.


 To generate a diff of this commit:
 cvs rdiff -u -r1.77 -r1.78 pkgsrc/pkgtools/pkgdiff/Makefile
 cvs rdiff -u -r1.21 -r1.22 pkgsrc/pkgtools/pkgdiff/files/pkgdiff

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Sun, 16 Sep 2012 18:15:44 +0000
State-Changed-Why:
fixed


>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.