Merge lp:~sylvain-pineau/checkbox/fix-1382321 into lp:checkbox

[Sylvain Pineau]

Fixes the linked bug where ~/.config/autostart was owned by root after pm tests.

[Zygmunt Krynicki (zyga)]

+1, nice, thanks

Could we please use providers:checkbox: as the leading commit tag though please?

[lp:~sylvain-pineau/checkbox/fix-1382321]

3460. By Sylvain Pineau on 2014-12-03

providers:checkbox:bin:pm_test: Ensure that ~/.config/autostart is not owned by root

pm_test has to be run by the root user, by using pkexec or sudo.
Problem is that if ~/.config/autostart does not exists the script did make
it without chown it back to the normal user.

The fix just calls os.chown() on both .config and autostart with normal uid/gid

Fixes: https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1382321

[Sylvain Pineau (sylvain-pineau)]

Fixed

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/pm_test'
--- providers/plainbox-provider-checkbox/bin/pm_test	2014-03-20 14:01:58 +0000
+++ providers/plainbox-provider-checkbox/bin/pm_test	2014-12-03 11:33:06 +0000
@@ -617,6 +617,11 @@
         autostart_directory = os.path.join(config_directory, 'autostart')
         if not os.path.exists(autostart_directory):
             os.makedirs(autostart_directory)
+            user_id = os.getenv('PKEXEC_UID') or os.getenv('SUDO_UID')
+            group_id = os.getenv('PKEXEC_UID') or os.getenv('SUDO_GID')
+            if user_id:
+                os.chown(config_directory, int(user_id), int(group_id))
+                os.chown(autostart_directory, int(user_id), int(group_id))
 
         basename = '{0}.desktop'.format(os.path.basename(__file__))
         self.desktop_filename = os.path.join(autostart_directory,