Review suggestions

Will reword/fixup for contribution guidlines after build and tests Signed-off-by: Trevor Benson <[email protected]>
sosreport · Dec 16, 2023 · e5c2442 · e5c2442
1 parent d1142b1
commit e5c2442
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/debian/control b/debian/control
@@ -22,7 +22,7 @@ Vcs-Git: https://salsa.debian.org/sosreport-team/sosreport.git
 
 Package: sosreport
 Architecture: any
-Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging
+Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging, python3-boto3
 Description: Set of tools to gather troubleshooting data from a system
  Sos is a set of tools that gathers information about system
  hardware and configuration. The information can then be used for

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -37,6 +37,7 @@ parts:
       - wheel
       - python_magic
       - packaging
+      - boto3
 
 apps:
   sos:

diff --git a/sos/policies/distros/__init__.py b/sos/policies/distros/__init__.py
@@ -8,7 +8,6 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-import boto3
 import os
 import re
 
@@ -33,6 +32,12 @@
 except ImportError:
     REQUESTS_LOADED = False
 
+try:
+    import boto3
+    BOTO3_LOADED = True
+except ImportError:
+    BOTO3_LOADED = False
+
 # Container environment variables for detecting if we're in a container
 ENV_CONTAINER = 'container'
 ENV_HOST_SYSROOT = 'HOST'
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ parts: @@
           - wheel
           - python_magic
           - packaging
+          - boto3
     apps:
       sos:
@@ Expand Down @@