From nobody@FreeBSD.org  Sun Jan 22 18:59:13 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92FB5106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Jan 2012 18:59:13 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EEC38FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Jan 2012 18:59:13 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0MIxDjI057721
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Jan 2012 18:59:13 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0MIxDFS057719;
	Sun, 22 Jan 2012 18:59:13 GMT
	(envelope-from nobody)
Message-Id: <201201221859.q0MIxDFS057719@red.freebsd.org>
Date: Sun, 22 Jan 2012 18:59:13 GMT
From: Yuri <yuri@tsoft.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] improvement of pkg_info warning
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164378
>Category:       bin
>Synopsis:       [patch] improvement of pkg_info(1) warning
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 22 19:00:19 UTC 2012
>Closed-Date:    Sat Jun 02 16:17:33 UTC 2012
>Last-Modified:  Sat Jun  2 16:20:16 UTC 2012
>Originator:     Yuri
>Release:        9.0
>Organization:
n/a
>Environment:
>Description:
This patch adds package name to the pkg_info warning "corrupted record (pkgdep line without argument)"
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- usr.sbin/pkg_install/lib/plist.c.orig       2012-01-22 10:34:23.000000000 -0800
+++ usr.sbin/pkg_install/lib/plist.c    2012-01-22 10:50:32.000000000 -0800
@@ -286,7 +286,8 @@
        if (*cp == '\0') {
            cp = NULL;
            if (cmd == PLIST_PKGDEP) {
-               warnx("corrupted record (pkgdep line without argument), ignoring");
+               warnx("corrupted record for package %s (pkgdep line without argument), ignoring",
+                  pkg->name);
                cmd = FAIL;
            }
            goto bottom;



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->portmgr 
Responsible-Changed-By: beat 
Responsible-Changed-When: Fri May 11 13:41:26 UTC 2012 
Responsible-Changed-Why:  
portmgr territory. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164378 
State-Changed-From-To: open->patched 
State-Changed-By: beat 
State-Changed-When: Fri May 11 16:11:17 UTC 2012 
State-Changed-Why:  
Patch committed to HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164378 
Responsible-Changed-From-To: portmgr->beat 
Responsible-Changed-By: beat 
Responsible-Changed-When: Sat May 12 02:08:29 UTC 2012 
Responsible-Changed-Why:  
I'll take it for MFC. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164378 

From: Yuri <yuri@rawbw.com>
To: beat@freebsd.org
Cc: bug-followup@freebsd.org
Subject: RE: bin/164378: [patch] improvement of pkg_info(1) warning
Date: Mon, 28 May 2012 17:43:38 -0700

 Could you please also check this into 8.0?
 
 Yuri

From: Yuri <yuri@rawbw.com>
To: Cc: beat@freebsd.org, bug-followup@freebsd.org
Subject: Re: bin/164378: [patch] improvement of pkg_info(1) warning
Date: Mon, 28 May 2012 17:46:10 -0700

 On 05/28/2012 17:43, Yuri wrote:
 > Could you please also check this into 8.0?
 >
 
 Sorry, I meant 9.0 STABLE.
State-Changed-From-To: patched->closed 
State-Changed-By: bapt 
State-Changed-When: Sat Jun 2 16:17:32 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164378 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/164378: commit references a PR
Date: Sat,  2 Jun 2012 16:16:13 +0000 (UTC)

 Author: bapt
 Date: Sat Jun  2 16:16:03 2012
 New Revision: 236453
 URL: http://svn.freebsd.org/changeset/base/236453
 
 Log:
   RFC: 235276
   
   - Print package name in case an empty pkgdep line is found.
   
   PR:		bin/164378
   Submitted by:	Yuri <yuri AT tsoft.com> and many others
   Approved by:	des (mentor)
 
 Modified:
   stable/9/usr.sbin/pkg_install/lib/plist.c
 Directory Properties:
   stable/9/usr.sbin/pkg_install/   (props changed)
 
 Modified: stable/9/usr.sbin/pkg_install/lib/plist.c
 ==============================================================================
 --- stable/9/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 15:14:12 2012	(r236452)
 +++ stable/9/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 16:16:03 2012	(r236453)
 @@ -286,7 +286,8 @@ read_plist(Package *pkg, FILE *fp)
  	if (*cp == '\0') {
  	    cp = NULL;
  	    if (cmd == PLIST_PKGDEP) {
 -		warnx("corrupted record (pkgdep line without argument), ignoring");
 +		warnx("corrupted record for package %s (pkgdep line without "
 +			"argument), ignoring", pkg->name);
  		cmd = FAIL;
  	    }
  	    goto bottom;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/164378: commit references a PR
Date: Sat,  2 Jun 2012 16:16:54 +0000 (UTC)

 Author: bapt
 Date: Sat Jun  2 16:16:45 2012
 New Revision: 236454
 URL: http://svn.freebsd.org/changeset/base/236454
 
 Log:
   RFC: 235276
   
   - Print package name in case an empty pkgdep line is found.
   
   PR:		bin/164378
   Submitted by:	Yuri <yuri AT tsoft.com> and many others
   Approved by:	des (mentor)
 
 Modified:
   stable/8/usr.sbin/pkg_install/lib/plist.c
 Directory Properties:
   stable/8/usr.sbin/pkg_install/   (props changed)
 
 Modified: stable/8/usr.sbin/pkg_install/lib/plist.c
 ==============================================================================
 --- stable/8/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 16:16:03 2012	(r236453)
 +++ stable/8/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 16:16:45 2012	(r236454)
 @@ -286,7 +286,8 @@ read_plist(Package *pkg, FILE *fp)
  	if (*cp == '\0') {
  	    cp = NULL;
  	    if (cmd == PLIST_PKGDEP) {
 -		warnx("corrupted record (pkgdep line without argument), ignoring");
 +		warnx("corrupted record for package %s (pkgdep line without "
 +			"argument), ignoring", pkg->name);
  		cmd = FAIL;
  	    }
  	    goto bottom;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/164378: commit references a PR
Date: Sat,  2 Jun 2012 16:17:34 +0000 (UTC)

 Author: bapt
 Date: Sat Jun  2 16:17:25 2012
 New Revision: 236455
 URL: http://svn.freebsd.org/changeset/base/236455
 
 Log:
   RFC: 235276
   
   - Print package name in case an empty pkgdep line is found.
   
   PR:		bin/164378
   Submitted by:	Yuri <yuri AT tsoft.com> and many others
   Approved by:	des (mentor)
 
 Modified:
   stable/7/usr.sbin/pkg_install/lib/plist.c
 Directory Properties:
   stable/7/usr.sbin/pkg_install/   (props changed)
 
 Modified: stable/7/usr.sbin/pkg_install/lib/plist.c
 ==============================================================================
 --- stable/7/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 16:16:45 2012	(r236454)
 +++ stable/7/usr.sbin/pkg_install/lib/plist.c	Sat Jun  2 16:17:25 2012	(r236455)
 @@ -286,7 +286,8 @@ read_plist(Package *pkg, FILE *fp)
  	if (*cp == '\0') {
  	    cp = NULL;
  	    if (cmd == PLIST_PKGDEP) {
 -		warnx("corrupted record (pkgdep line without argument), ignoring");
 +		warnx("corrupted record for package %s (pkgdep line without "
 +			"argument), ignoring", pkg->name);
  		cmd = FAIL;
  	    }
  	    goto bottom;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
