Merge branch 'master' into work

43 files changed, 90 insertions, 10 deletions

diff --git a/etc/bash_completion.d/mock.bash b/etc/bash_completion.d/mock.bash
index 12afcce..599a011 100644
--- a/etc/bash_completion.d/mock.bash
+++ b/etc/bash_completion.d/mock.bash
@@ -25,8 +25,7 @@ _mock()
             ;;
         -r|--root)
             COMPREPLY=( $( compgen -W "$( command ls $cfgdir 2>/dev/null | \
-                sed -e '/^site-defaults\.cfg$/d' -ne 's/\.cfg$//p' )" \
-                -- "$2" ) )
+                sed -ne 's/\.cfg$//p' )" -X site-defaults -- "$2" ) )
             return 0
             ;;
         --configdir|--resultdir)
diff --git a/etc/mock/epel-4-i386.cfg b/etc/mock/epel-4-i386.cfg
index a2b8a7c..089f2eb 100644
--- a/etc/mock/epel-4-i386.cfg
+++ b/etc/mock/epel-4-i386.cfg
@@ -16,6 +16,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/epel-4-ppc.cfg b/etc/mock/epel-4-ppc.cfg
index 88f75b9..8b03f13 100644
--- a/etc/mock/epel-4-ppc.cfg
+++ b/etc/mock/epel-4-ppc.cfg
@@ -16,6 +16,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/epel-4-x86_64.cfg b/etc/mock/epel-4-x86_64.cfg
index 354c0da..7b665a8 100644
--- a/etc/mock/epel-4-x86_64.cfg
+++ b/etc/mock/epel-4-x86_64.cfg
@@ -17,6 +17,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/epel-5-i386.cfg b/etc/mock/epel-5-i386.cfg
index 58551e3..cec01ee 100644
--- a/etc/mock/epel-5-i386.cfg
+++ b/etc/mock/epel-5-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/epel-5-ppc.cfg b/etc/mock/epel-5-ppc.cfg
index 5c25011..973186d 100644
--- a/etc/mock/epel-5-ppc.cfg
+++ b/etc/mock/epel-5-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/epel-5-x86_64.cfg b/etc/mock/epel-5-x86_64.cfg
index 199fcfe..41a5d92 100644
--- a/etc/mock/epel-5-x86_64.cfg
+++ b/etc/mock/epel-5-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 exclude=[1-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/fedora-10-i386.cfg b/etc/mock/fedora-10-i386.cfg
index 6584275..0d41c47 100644
--- a/etc/mock/fedora-10-i386.cfg
+++ b/etc/mock/fedora-10-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-10-ppc.cfg b/etc/mock/fedora-10-ppc.cfg
index cee534c..3c39e38 100644
--- a/etc/mock/fedora-10-ppc.cfg
+++ b/etc/mock/fedora-10-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.ppc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-10-ppc64.cfg b/etc/mock/fedora-10-ppc64.cfg
index ca66342..078d79c 100644
--- a/etc/mock/fedora-10-ppc64.cfg
+++ b/etc/mock/fedora-10-ppc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-10-s390x.cfg b/etc/mock/fedora-10-s390x.cfg
index 2fb246e..f9017eb 100644
--- a/etc/mock/fedora-10-s390x.cfg
+++ b/etc/mock/fedora-10-s390x.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-10-sparc.cfg b/etc/mock/fedora-10-sparc.cfg
index 3f2bb0c..b091338 100644
--- a/etc/mock/fedora-10-sparc.cfg
+++ b/etc/mock/fedora-10-sparc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-10-sparc64.cfg b/etc/mock/fedora-10-sparc64.cfg
index 8e9bef9..1b7df2d 100644
--- a/etc/mock/fedora-10-sparc64.cfg
+++ b/etc/mock/fedora-10-sparc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-10-x86_64.cfg b/etc/mock/fedora-10-x86_64.cfg
index a512b47..6b8ac49 100644
--- a/etc/mock/fedora-10-x86_64.cfg
+++ b/etc/mock/fedora-10-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 #exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/fedora-11-i386.cfg b/etc/mock/fedora-11-i386.cfg
index 6119223..0e6223d 100644
--- a/etc/mock/fedora-11-i386.cfg
+++ b/etc/mock/fedora-11-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-11-ppc.cfg b/etc/mock/fedora-11-ppc.cfg
index 30bb120..d5c8727 100644
--- a/etc/mock/fedora-11-ppc.cfg
+++ b/etc/mock/fedora-11-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.ppc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-11-ppc64.cfg b/etc/mock/fedora-11-ppc64.cfg
index ef6be3d..e7f4c8a 100644
--- a/etc/mock/fedora-11-ppc64.cfg
+++ b/etc/mock/fedora-11-ppc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-11-s390x.cfg b/etc/mock/fedora-11-s390x.cfg
index 13d04eb..d37fee0 100644
--- a/etc/mock/fedora-11-s390x.cfg
+++ b/etc/mock/fedora-11-s390x.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-11-sparc.cfg b/etc/mock/fedora-11-sparc.cfg
index ba974d1..e8d6839 100644
--- a/etc/mock/fedora-11-sparc.cfg
+++ b/etc/mock/fedora-11-sparc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-11-sparc64.cfg b/etc/mock/fedora-11-sparc64.cfg
index 64e0609..71e2d1e 100644
--- a/etc/mock/fedora-11-sparc64.cfg
+++ b/etc/mock/fedora-11-sparc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-11-x86_64.cfg b/etc/mock/fedora-11-x86_64.cfg
index 787cc38..c239539 100644
--- a/etc/mock/fedora-11-x86_64.cfg
+++ b/etc/mock/fedora-11-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 #exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/fedora-12-i386.cfg b/etc/mock/fedora-12-i386.cfg
index 7c1bf91..68b8286 100644
--- a/etc/mock/fedora-12-i386.cfg
+++ b/etc/mock/fedora-12-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-12-ppc.cfg b/etc/mock/fedora-12-ppc.cfg
index 0146737..32c5e7f 100644
--- a/etc/mock/fedora-12-ppc.cfg
+++ b/etc/mock/fedora-12-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.ppc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-12-ppc64.cfg b/etc/mock/fedora-12-ppc64.cfg
index 32a9c2a..61fe803 100644
--- a/etc/mock/fedora-12-ppc64.cfg
+++ b/etc/mock/fedora-12-ppc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-12-s390x.cfg b/etc/mock/fedora-12-s390x.cfg
index b6ed9e4..7812607 100644
--- a/etc/mock/fedora-12-s390x.cfg
+++ b/etc/mock/fedora-12-s390x.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-12-sparc.cfg b/etc/mock/fedora-12-sparc.cfg
index 0bc26fa..dda7eeb 100644
--- a/etc/mock/fedora-12-sparc.cfg
+++ b/etc/mock/fedora-12-sparc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-12-sparc64.cfg b/etc/mock/fedora-12-sparc64.cfg
index b0c498a..8ac21c8 100644
--- a/etc/mock/fedora-12-sparc64.cfg
+++ b/etc/mock/fedora-12-sparc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-12-x86_64.cfg b/etc/mock/fedora-12-x86_64.cfg
index f209e08..e711524 100644
--- a/etc/mock/fedora-12-x86_64.cfg
+++ b/etc/mock/fedora-12-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 #exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/fedora-13-i386.cfg b/etc/mock/fedora-13-i386.cfg
index 3a6b8c6..4dace19 100644
--- a/etc/mock/fedora-13-i386.cfg
+++ b/etc/mock/fedora-13-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-13-ppc.cfg b/etc/mock/fedora-13-ppc.cfg
index fd61671..27623c2 100644
--- a/etc/mock/fedora-13-ppc.cfg
+++ b/etc/mock/fedora-13-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.ppc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-13-ppc64.cfg b/etc/mock/fedora-13-ppc64.cfg
index f728d91..031d232 100644
--- a/etc/mock/fedora-13-ppc64.cfg
+++ b/etc/mock/fedora-13-ppc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-13-s390x.cfg b/etc/mock/fedora-13-s390x.cfg
index f65bf5b..f657542 100644
--- a/etc/mock/fedora-13-s390x.cfg
+++ b/etc/mock/fedora-13-s390x.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-13-sparc.cfg b/etc/mock/fedora-13-sparc.cfg
index 777df2c..16f4192 100644
--- a/etc/mock/fedora-13-sparc.cfg
+++ b/etc/mock/fedora-13-sparc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-13-sparc64.cfg b/etc/mock/fedora-13-sparc64.cfg
index 21b2f82..3990d77 100644
--- a/etc/mock/fedora-13-sparc64.cfg
+++ b/etc/mock/fedora-13-sparc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-13-x86_64.cfg b/etc/mock/fedora-13-x86_64.cfg
index 140b2b6..6bb9e51 100644
--- a/etc/mock/fedora-13-x86_64.cfg
+++ b/etc/mock/fedora-13-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 #exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg
index e42980e..30995c0 100644
--- a/etc/mock/fedora-rawhide-i386.cfg
+++ b/etc/mock/fedora-rawhide-i386.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-ppc.cfg b/etc/mock/fedora-rawhide-ppc.cfg
index 4fd9f98..83ac62a 100644
--- a/etc/mock/fedora-rawhide-ppc.cfg
+++ b/etc/mock/fedora-rawhide-ppc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.ppc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-rawhide-ppc64.cfg b/etc/mock/fedora-rawhide-ppc64.cfg
index c7a4edf..2b23a2c 100644
--- a/etc/mock/fedora-rawhide-ppc64.cfg
+++ b/etc/mock/fedora-rawhide-ppc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-s390x.cfg b/etc/mock/fedora-rawhide-s390x.cfg
index 10ba32d..bd42869 100644
--- a/etc/mock/fedora-rawhide-s390x.cfg
+++ b/etc/mock/fedora-rawhide-s390x.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-sparc.cfg b/etc/mock/fedora-rawhide-sparc.cfg
index be8a16a..2f4a1e5 100644
--- a/etc/mock/fedora-rawhide-sparc.cfg
+++ b/etc/mock/fedora-rawhide-sparc.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 #exclude=*.sparc64
 # The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
 
diff --git a/etc/mock/fedora-rawhide-sparc64.cfg b/etc/mock/fedora-rawhide-sparc64.cfg
index 305c0e8..8d1989c 100644
--- a/etc/mock/fedora-rawhide-sparc64.cfg
+++ b/etc/mock/fedora-rawhide-sparc64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 
 # repos
 
diff --git a/etc/mock/fedora-rawhide-x86_64.cfg b/etc/mock/fedora-rawhide-x86_64.cfg
index a69350d..23c0108 100644
--- a/etc/mock/fedora-rawhide-x86_64.cfg
+++ b/etc/mock/fedora-rawhide-x86_64.cfg
@@ -13,6 +13,8 @@ retries=20
 obsoletes=1
 gpgcheck=0
 assumeyes=1
+syslog_ident=mock
+syslog_device=
 # grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
 # .i?86 packages except these.
 #exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
diff --git a/py/mock/util.py b/py/mock/util.py
index 3322cd5..764ed04 100644
--- a/py/mock/util.py
+++ b/py/mock/util.py
@@ -263,14 +263,13 @@ def logOutput(fds, logger, returnOutput=1, start=0, timeout=0):
 
 decorate(traceLog())
 def selinuxEnabled():
-    p = subprocess.Popen(["/usr/sbin/getenforce"], 
-                         shell=True, 
-                         stdout=subprocess.PIPE, 
-                         close_fds=True)
-    p.wait()
-    if p.stdout.read().strip() == "Disabled":
-        return False
-    return True
+    """Check if SELinux is enabled (enforcing or permissive)."""
+    try:
+        if open("/selinux/enforce").read().strip() in ("1", "0"):
+            return True
+    except:
+        pass
+    return False
 
 # logger =
 # output = [1|0]