Merge lp:~jelmer/brz/symlink-dev-null into lp:brz

[Jelmer Vernooij]

Allow /dev/null to be a symlink.

Allow /dev/null to be a symlink.

Necessary on Illumos.

[Martin Packman (gz)]

Seems perfectly reasonable.

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/494/

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2018-09-11 07:31:44 +0000
+++ breezy/tests/test_osutils.py	2018-09-18 02:09:18 +0000
@@ -313,7 +313,9 @@
             if e.errno not in (errno.ENOENT,):
                 raise
         else:
-            self.assertEqual('chardev', osutils.file_kind('/dev/null'))
+            self.assertEqual(
+                    'chardev',
+                    osutils.file_kind(os.path.realpath('/dev/null')))
 
         mkfifo = getattr(os, 'mkfifo', None)
         if mkfifo:

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-09-16 09:45:55 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-09-18 02:09:18 +0000
@@ -274,6 +274,8 @@
 Testing
 *******
 
+ * Allow /dev/null to be a symlink to a chardev. (Igo Pashev, #832257)
+
  * A test isolation issue in ``breezy.tests.test_ui`` was fixed,
    which caused ``output_encoding = iso-8859-1`` to be added to the
    users' bazaar.conf. (Jelmer Vernooij)