2
0
Эх сурвалжийг харах

BORG_SHOW_SYSINFO=no to hide system information from exceptions

Can be used:
- in case of troubles with the sysinfo code
- by borg backup providers who do not want to show system information

(cherry picked from commit 64aaec662805fecadbd0108d8840945982a73808)
Thomas Waldmann 7 жил өмнө
parent
commit
d94bd22740

+ 4 - 0
docs/usage_general.rst.inc

@@ -197,6 +197,10 @@ General:
         When set to a numeric value, this determines the maximum "time to live" for the files cache
         entries (default: 20). The files cache is used to quickly determine whether a file is unchanged.
         The FAQ explains this more detailed in: :ref:`always_chunking`
+    BORG_SHOW_SYSINFO
+        When set to no (default: yes), system information (like OS, Python version, ...) in
+        exceptions is not shown.
+        Please only use for good reasons as it makes issues harder to analyze.
     TMPDIR
         where temporary files are stored (might need a lot of temporary space for some operations)
 

+ 4 - 0
src/borg/helpers/misc.py

@@ -61,6 +61,10 @@ def prune_split(archives, rule, n, kept_because=None):
 
 
 def sysinfo():
+    show_sysinfo = os.environ.get('BORG_SHOW_SYSINFO', 'yes').lower()
+    if show_sysinfo == 'no':
+        return ''
+
     python_implementation = platform.python_implementation()
     python_version = platform.python_version()
     # platform.uname() does a shell call internally to get processor info,