From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1032825-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 01EA6138334
for <garchives@archives.gentoo.org>; Tue, 26 Jun 2018 08:07:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 06C1BE0905;
Tue, 26 Jun 2018 08:07:02 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C7A5EE0905
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jun 2018 08:07:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 604CE335C70
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jun 2018 08:07:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C5002C2
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jun 2018 08:06:58 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1530000408.e9a84ab3f13a3bff6ebd2ba46ce913a3a671577f.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
X-VCS-Directories: media-sound/pulseaudio/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: e9a84ab3f13a3bff6ebd2ba46ce913a3a671577f
X-VCS-Branch: master
Date: Tue, 26 Jun 2018 08:06:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 05027e1c-2081-4fca-9a69-ae2b66f42216
X-Archives-Hash: 0267174505c4564519daadebd57fa3ef
commit: e9a84ab3f13a3bff6ebd2ba46ce913a3a671577f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 08:06:48 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 08:06:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a84ab3
media-sound/pulseaudio: Fixed rm error.
Closes: https://bugs.gentoo.org/658704
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
index 4ed441bbe23..09c196fc43b 100644
--- a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
@@ -282,7 +282,9 @@ multilib_src_install_all() {
systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
else
# Prevent warnings when system-wide is not used, bug #447694
- rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+ if use dbus ; then
+ rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+ fi
fi
if use zeroconf ; then