Date: Sat, 8 Jul 2017 16:47:23 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445340 - in head/sysutils/beadm: . files Message-ID: <201707081647.v68GlNVa095031@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Jul 8 16:47:22 2017 New Revision: 445340 URL: https://svnweb.freebsd.org/changeset/ports/445340 Log: Unbreak 'beadm list'. This basically reverts to 1.2.6 minus a 2>/dev/null change remaining. PR: 219256 Reported by: dim Modified: head/sysutils/beadm/Makefile head/sysutils/beadm/files/patch-beadm Modified: head/sysutils/beadm/Makefile ============================================================================== --- head/sysutils/beadm/Makefile Sat Jul 8 14:15:24 2017 (r445339) +++ head/sysutils/beadm/Makefile Sat Jul 8 16:47:22 2017 (r445340) @@ -2,7 +2,7 @@ PORTNAME= beadm PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/sysutils/beadm/files/patch-beadm ============================================================================== --- head/sysutils/beadm/files/patch-beadm Sat Jul 8 14:15:24 2017 (r445339) +++ head/sysutils/beadm/files/patch-beadm Sat Jul 8 16:47:22 2017 (r445340) @@ -1,7 +1,5 @@ -diff --git beadm beadm -index 6a0e397..f817e40 100755 ---- beadm -+++ beadm +--- beadm.orig 2017-01-13 15:25:44.000000000 -0800 ++++ beadm 2017-07-08 09:45:40.962588000 -0700 @@ -128,6 +128,24 @@ __be_new() { # 1=SOURCE 2=TARGET unset NAME_NEW unset NAME_SANITY @@ -81,3 +79,12 @@ index 6a0e397..f817e40 100755 # clone properties of source boot environment zfs list -H -o name -r ${SOURCE} \ | grep -v '@' \ +@@ -303,7 +351,7 @@ case ${1} in + while(CMD_ZFS_LIST BENAME_BEGINS_WITH | getline) { + if($1 != BENAME_BEGINS_WITH) { + FSNAME = $1 +- FSNAMES[length(FSNAME) + 1] = FSNAME ++ FSNAMES[length(FSNAMES) + 1] = FSNAME + USED = __normalize($2) + USEDBYDATASET = __normalize($3) + USEDBYSNAPSHOTS = __normalize($4)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707081647.v68GlNVa095031>