Merge lp:~jelmer/brz/create-config-dir into lp:brz/3.0

[Jelmer Vernooij]

Don't fail when unable to write per-user ignore list due to one of the intermediate directories not existing

Don't fail when unable to write per-user ignore list due to one of the intermediate directories not existing

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/62/

=== modified file 'breezy/ignores.py'
--- breezy/ignores.py	2019-02-15 17:41:17 +0000
+++ breezy/ignores.py	2019-11-18 00:41:46 +0000
@@ -101,8 +101,8 @@
         # since get_* should be a safe operation
         try:
             _set_user_ignores(USER_DEFAULTS)
-        except (IOError, OSError) as e:
-            if e.errno not in (errno.EPERM,):
+        except EnvironmentError as e:
+            if e.errno not in (errno.EPERM, errno.ENOENT):
                 raise
         return patterns
 

=== modified file 'breezy/tests/test_ignores.py'
--- breezy/tests/test_ignores.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_ignores.py	2019-11-18 00:41:46 +0000
@@ -16,6 +16,8 @@
 
 """Tests for handling of ignore files"""
 
+import os
+
 from .. import (
     config,
     ignores,
@@ -86,6 +88,22 @@
             entries = ignores.parse_ignore_file(f)
         self.assertEqual(set(ignores.USER_DEFAULTS), entries)
 
+    def test_create_with_intermediate_missing(self):
+        # $HOME should be set to '.'
+        ignore_path = config.user_ignore_config_filename()
+        self.assertPathDoesNotExist(ignore_path)
+        os.mkdir('empty-home')
+
+        config_path = os.path.join(self.test_dir, 'empty-home', '.config')
+        self.overrideEnv('BRZ_HOME', config_path)
+        self.assertPathDoesNotExist(config_path)
+
+        user_ignores = ignores.get_user_ignores()
+        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
+
+        ignore_path = config.user_ignore_config_filename()
+        self.assertPathDoesNotExist(ignore_path)
+
     def test_use_existing(self):
         patterns = [u'*.o', u'*.py[co]', u'\xe5*']
         ignores._set_user_ignores(patterns)

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-11-17 23:17:29 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-11-18 00:41:46 +0000
@@ -36,6 +36,10 @@
    significantly slow down startup on some platforms.
    (Jelmer Vernooij, #1832868)
 
+ * Don't fail when unable to write per-user ignore list due to
+   one of the intermediate directories not existing
+   (Jelmer Vernooij, #1851904)
+
  * Fix file graph operations on Git repositories.
    (Jelmer Vernooij, #1847913)