From 79f2f2539ca4015595b6c62a355f08cf7c65f184 Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <apyhalov@gmail.com> Date: Wed, 11 Nov 2015 23:07:54 +0100 Subject: [PATCH] Don't incorporate */g++/* packages (with new history logic) --- tools/generate-history | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/generate-history b/tools/generate-history index 78349db..ee48d7a 100644 --- a/tools/generate-history +++ b/tools/generate-history @@ -17,12 +17,17 @@ continue } printf "set name=pkg.fmri value=pkg:/%s\n", fmri - if (NF == 2) { + + if (NF >= 2) { print "set name=pkg.renamed value=true" printf "depend type=require fmri=%s\n", $2 } else { print "set name=pkg.obsolete value=true" } + + if ($NF == "noincorporate") { + print "set name=pkg.tmp.noincorporate value=true" + } print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)" exit 0 # We're done; no point continuing. } -- Gitblit v1.9.3