slapos.util: chownDirectory: Add support for different executable locations.

abe4ec1f · Cédric de Saint Martin · Rafael Monnerat · 0e542a43 · abe4ec1f
Commit abe4ec1f authored Sep 16, 2014 by Cédric de Saint Martin Committed by Rafael Monnerat Nov 10, 2014
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

slapos/util.py slapos/util.py +6 -1

No files found.
--- a/slapos/util.py
+++ b/slapos/util.py
@@ -53,7 +53,12 @@ def chownDirectory(path, uid, gid):
    subprocess.check_call(['/bin/chown', '-R', '%s:%s' % (uid, gid), path])
  else:
    # we are probably inside webrunner
-    subprocess.check_call(['/bin/chgrp', '-R', '%s' % gid, path])
+    chgrp_location = '/bin/chgrp'
+    if not os.path.exists(chgrp_location):
+      chgrp_location = '/usr/bin/chgrp'
+    if not os.path.exists(chgrp_location):
+      chgrp_location = 'chgrp'
+    subprocess.check_call([chgrp_location, '-R', '%s' % gid, path])


 def parse_certificate_key_pair(html):