Merge ~pieq/bugit/+git/qabro:fix-lp1782526-acpidump into bugit:master

[Pierre Equoy]

Tested OK on 18.04 desktop and UC16.

Example output:

https://bugs.staging.launchpad.net/qabro/+bug/1782808 → note the acpidump.log attachment (this is the staging instance, so this bug might disappear any moment)

As usual, you can test this change by:

- snapping it up: `snapcraft cleanbuild`
- installing it: sudo snap install qabro_0.7dev_amd64.snap --devmode
- file an issue on staging Launchpad: APPORT_STAGING=1 qabro
- check that the issue is created and includes acpidump.log (acpidump is supposed to be attached no matter the issue type)

[Maciej Kisielewski (kissiel)]

LGTM, +1

review: Approve

diff --git a/qabro/bug_assistant.py b/qabro/bug_assistant.py
index 6cb741b..6ebf4b6 100644
--- a/qabro/bug_assistant.py
+++ b/qabro/bug_assistant.py
@@ -211,6 +211,7 @@ class AttachmentAssistant:
         if self.options.get('include_fwts_logs'):
             self.attach_fwts_logs()
         self.attach_snaplist()
+        self.attach_acpidump()
         self.attach_sosreport()
 
     def attach_sosreport(self):
@@ -302,6 +303,16 @@ class AttachmentAssistant:
         else:
             print("$PATH and/or $LD_LIBRARY_PATH missing. Cannot run FWTS!")
 
+    def attach_acpidump(self):
+        print("Running acpidump...")
+        p = os.getenv('PATH')
+        if p:
+            command = ["sudo", "env", "PATH={}".format(p), "acpidump-acpica"]
+            output = subprocess.check_output(command)
+            self.attachments['acpidump.log'] = output
+        else:
+            print("$PATH missing. Cannot run acpidump!")
+
     @classmethod
     def get_standard_info(cls):
         """Gather standard information that should be present in all bugs."""
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index de2f615..b7213b9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -22,6 +22,9 @@ apps:
     environment:
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/lib/fwts
 
+  acpidump:
+    command: acpidump-acpica
+
 parts:
   qabro:
     plugin: python
@@ -65,6 +68,12 @@ parts:
       - libglib2.0-dev
       - libfdt-dev
 
+  acpidump:
+    plugin: nil
+    stage-packages:
+      - acpica-tools
+      - libc6
+
   config:
     plugin: dump
     source: config/