summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-11-06 10:57:09 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-11-06 10:57:09 +0000
commit8444180b8b7ec2728d6f7b6cc8a32eda20bee49e (patch)
treebafffe61821cefa631a085fae0b000bcb886be1d
parentStable for HPPA (bug #488300). (diff)
downloadgentoo-2-8444180b8b7ec2728d6f7b6cc8a32eda20bee49e.tar.gz
gentoo-2-8444180b8b7ec2728d6f7b6cc8a32eda20bee49e.tar.bz2
gentoo-2-8444180b8b7ec2728d6f7b6cc8a32eda20bee49e.zip
Don't run pax-mark when variable "m" is empty wrt #485910 by "Nikoli"
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
-rw-r--r--sys-auth/polkit/ChangeLog5
-rw-r--r--sys-auth/polkit/polkit-0.112-r2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 5d5781a54001..9205321bc7f2 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-auth/polkit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.187 2014/11/04 09:22:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.188 2014/11/06 10:57:09 ssuominen Exp $
+
+ 06 Nov 2014; Samuli Suominen <ssuominen@gentoo.org> polkit-0.112-r2.ebuild:
+ Don't run pax-mark when variable "m" is empty wrt #485910 by "Nikoli"
04 Nov 2014; Agostino Sarubbo <ago@gentoo.org> polkit-0.112-r2.ebuild:
Stable for sparc, wrt bug #525252
diff --git a/sys-auth/polkit/polkit-0.112-r2.ebuild b/sys-auth/polkit/polkit-0.112-r2.ebuild
index 344eac247518..d86ceac16c25 100644
--- a/sys-auth/polkit/polkit-0.112-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.13 2014/11/04 09:22:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.14 2014/11/06 10:57:09 ssuominen Exp $
EAPI=5
inherit eutils multilib pam pax-utils systemd user
@@ -91,7 +91,7 @@ src_compile() {
use hppa && m='mr'
use ia64 && m='mr'
use mips && m='mr'
- pax-mark ${m} ${f}
+ [ -n "$m" ] && pax-mark ${m} ${f}
}
src_install() {