From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QRkPC-000256-3M for garchives@archives.gentoo.org; Wed, 01 Jun 2011 12:20:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 175B31C090; Wed, 1 Jun 2011 12:19:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D139D1C090 for ; Wed, 1 Jun 2011 12:19:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51B4C1B4011 for ; Wed, 1 Jun 2011 12:19:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B47398050C for ; Wed, 1 Jun 2011 12:19:51 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/libbash:master commit in: utils/ X-VCS-Repository: proj/libbash X-VCS-Files: utils/metadata.cpp X-VCS-Directories: utils/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: e6af93628b7715f05fdd3fe7e37918de48e2554d Date: Wed, 1 Jun 2011 12:19:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: fd0f05a74498e34d60c5241be2658c04 commit: e6af93628b7715f05fdd3fe7e37918de48e2554d Author: Mu Qiao gentoo org> AuthorDate: Tue May 31 07:32:31 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Wed Jun 1 12:15:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3De6af9362 Utility: fix the order of INHERITED Portage requires INHERITED values to be sorted. Now this is fixed. --- utils/metadata.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/utils/metadata.cpp b/utils/metadata.cpp index 600f9e4..899ef80 100644 --- a/utils/metadata.cpp +++ b/utils/metadata.cpp @@ -93,6 +93,11 @@ void write_metadata(std::ostream& output, value, boost::is_any_of(" \t\n"), boost::token_compress_on); + + // INHERITED eclasses should be sorted + if(*iter_name =3D=3D "INHERITED") + sort(splitted_value.begin(), splitted_value.end()); + using namespace boost::spirit::karma; output << format(string % ' ', splitted_value) << std::endl; }