Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jul 2012 08:25:35 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301711 - in head/ports-mgmt/pkg: . files
Message-ID:  <201207300825.q6U8PZt3066746@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Jul 30 08:25:34 2012
New Revision: 301711
URL: http://svn.freebsd.org/changeset/ports/301711

Log:
  Fix a regression appending newline to commments
  
  Reported by:	avilla

Added:
  head/ports-mgmt/pkg/files/
  head/ports-mgmt/pkg/files/patch-libpkg__pkg_manifest.c   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Mon Jul 30 08:10:00 2012	(r301710)
+++ head/ports-mgmt/pkg/Makefile	Mon Jul 30 08:25:34 2012	(r301711)
@@ -7,6 +7,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.0-rc5
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/

Added: head/ports-mgmt/pkg/files/patch-libpkg__pkg_manifest.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_manifest.c	Mon Jul 30 08:25:34 2012	(r301711)
@@ -0,0 +1,12 @@
+--- ./libpkg/pkg_manifest.c.orig	2012-07-30 01:08:44.000000000 +0200
++++ ./libpkg/pkg_manifest.c	2012-07-30 10:23:20.768918130 +0200
+@@ -189,8 +189,7 @@
+ {
+ 	int ret = EPKG_OK;
+ 
+-	while (val->data.scalar.length > 1 &&
+-	    val->data.scalar.value[val->data.scalar.length - 2] == '\n' &&
++	while (val->data.scalar.length > 0 &&
+ 	    val->data.scalar.value[val->data.scalar.length - 1] == '\n') {
+ 		val->data.scalar.value[val->data.scalar.length - 1] = '\0';
+ 		val->data.scalar.length--;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207300825.q6U8PZt3066746>