mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

- Only show conversion "seatbelt" notice if no

Browse Source 
pkgng packages have been installed yet. This fixes
  the notice showing after already running pkg2ng but
  having 1 or more packages fail to convert.

Approved by:	bapt
This commit is contained in:
Bryan Drewery 2013-01-09 03:48:37 +00:00
parent ed1ba2843f
commit a571a5e592
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=310120
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports-mgmt/pkg/Makefile
View File

@ -59,7 +59,14 @@ MLINKS= pkg-delete.8 pkg-remove.8 \
.if defined(WITH_PKGNG) .if defined(WITH_PKGNG)
.if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l
.if ${NB_OLDPKGS} > 0 .if exists(${PKG_BIN})
NB_NEWPKGS!= ${PKG_INFO} -aq | wc -l
.else
NB_NEWPKGS= 0
.endif
# Only show the pre-everything notice if they have not already
# converted any packages
.if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0
pre-everything:: pre-everything::
@${ECHO_CMD} "You are about to convert your system to pkgng while you have ports/packages"; \ @${ECHO_CMD} "You are about to convert your system to pkgng while you have ports/packages"; \