Merge lp:~dobey/ubuntuone-dev-tools/home-is-trial-temp into lp:ubuntuone-dev-tools

[dobey]

Disable lint error in u1lint
Disable W0404 lint warnings, as they seem to be erroneous
Set the HOME and more XDG env vars, for cron, and to avoid user's $HOME

[Guillermo Gonzalez (verterok)]

looks good! +1

review: Approve

[Facundo Batista (facundo)]

Like it!

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2010-12-22 16:56:33 +0000
+++ bin/u1lint	2011-04-13 15:02:50 +0000
@@ -122,9 +122,11 @@
         config = ConfigParser.ConfigParser()
         config.read([PYLINTRC])
 
+        # pylint: disable=E1103
         return config.get("MASTER", "ignore").split(",")
     except (TypeError, ConfigParser.NoOptionError):
         return None
+    # pylint: enable=E1103
 
 def _group_lines_by_file(data):
     """Format file:line:message output as lines grouped by file."""

=== modified file 'bin/u1trial'
--- bin/u1trial	2011-03-31 17:27:43 +0000
+++ bin/u1trial	2011-04-13 15:02:50 +0000
@@ -84,13 +84,27 @@
         _install_reactor(qt_reactor)
         from twisted.trial.reporter import TreeReporter
 
-        # setup a custom XDG_CACHE_HOME and create the logs directory
-        xdg_cache = os.path.join(os.getcwd(), "_trial_temp", "xdg_cache")
-        os.environ["XDG_CACHE_HOME"] = xdg_cache
+        # set $HOME to the _trial_temp dir, to avoid breaking user files
+        homedir = os.path.join(os.getcwd(), '_trial_temp')
+        os.environ['HOME'] = homedir
+
+        # setup $XDG_*_HOME variables and create the directories
+        xdg_cache = os.path.join(homedir, 'xdg_cache')
+        xdg_config = os.path.join(homedir, 'xdg_config')
+        xdg_data = os.path.join(homedir, 'xdg_data')
+        os.environ['XDG_CACHE_HOME'] = xdg_cache
+        os.environ['XDG_CONFIG_HOME'] = xdg_config
+        os.environ['XDG_DATA_HOME'] = xdg_data
+
+        if not os.path.exists(xdg_cache):
+            os.makedirs(xdg_cache)
+        if not os.path.exists(xdg_config):
+            os.makedirs(xdg_config)
+        if not os.path.exists(xdg_data):
+            os.makedirs(xdg_data)
+
         # setup the ROOTDIR env var
         os.environ['ROOTDIR'] = os.getcwd()
-        if not os.path.exists(xdg_cache):
-            os.makedirs(xdg_cache)
 
         self.tempdir = os.path.join(os.getcwd(), "_trial_temp")
         working_dir = os.path.join(self.tempdir, 'tmp')

=== modified file 'pylintrc'
--- pylintrc	2010-10-13 19:20:56 +0000
+++ pylintrc	2011-04-13 15:02:50 +0000
@@ -50,7 +50,8 @@
 # W0142: Used * or ** magic
 # W0221: Arguments number differs from %s method (pylint is confused by * and **)
 # W0613: Unused argument %r (We get lots of these from interfaces)
-disable=R,I,W0142,W0221,W0613
+# W0404: Erroneous re-import warning: MM: X Reimported (line MM)
+disable=R,I,W0142,W0221,W0613,W0404
 
 
 [REPORTS]