Merge "Ensure correct polkit config written for RHEL6"
diff --git a/stack.sh b/stack.sh
index d534b87..32a7d74 100755
--- a/stack.sh
+++ b/stack.sh
@@ -105,7 +105,7 @@
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack``
-if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|f16|f17|f18|opensuse-12.2|rhel6) ]]; then
+if [[ ! ${DISTRO} =~ (oneiric|precise|quantal|raring|saucy|f16|f17|f18|opensuse-12.2|rhel6) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
@@ -579,6 +579,17 @@
# Nova stopping later on complaining that
# '/var/lib/dbus/machine-id' doesn't exist.
sudo service messagebus restart
+
+ # In setup.py, a "setup_requires" package is supposed to
+ # transient. However there is a bug with rhel6 distribute where
+ # setup_requires packages can register entry points that aren't
+ # cleared out properly after the setup-phase; the end result is
+ # installation failures (bz#924038). Thus we pre-install the
+ # problem package here; this way the setup_requires dependency is
+ # already satisfied and it will not need to be installed
+ # transiently, meaning we avoid the issue of it not being cleaned
+ # out properly. Note we do this before the track-depends below.
+ pip_install hgtools
fi
TRACK_DEPENDS=${TRACK_DEPENDS:-False}