Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppetserver/
Date: Sun, 22 Sep 2019 06:08:01
Message-Id: 1569132473.cb680a5e45d6569f2bc6017a19f36f4d187f56a3.prometheanfire@gentoo
1 commit: cb680a5e45d6569f2bc6017a19f36f4d187f56a3
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 22 06:07:39 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 22 06:07:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb680a5e
7
8 app-admin/puppetserver: fix post-install message
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.17
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppetserver/puppetserver-6.6.0.ebuild | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/app-admin/puppetserver/puppetserver-6.6.0.ebuild b/app-admin/puppetserver/puppetserver-6.6.0.ebuild
17 index e064d2554eb..1b0b26fd739 100644
18 --- a/app-admin/puppetserver/puppetserver-6.6.0.ebuild
19 +++ b/app-admin/puppetserver/puppetserver-6.6.0.ebuild
20 @@ -125,11 +125,11 @@ pkg_postinst() {
21 elog "# install puppetserver gems"
22 elog "cd /opt/puppetlabs/server/apps/puppetserver"
23 elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
24 - elog "while read LINE do"
25 + elog "while read LINE; do"
26 elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
27 elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
28 elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
29 - elog "while read LINE do"
30 + elog "while read LINE; do"
31 elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
32 - elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
33 + elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
34 }