Merge pull request #108 from johnmikee/main

salopensource · Sep 14, 2023 · c4c97de · c4c97de
2 parents 7b2e336 + 4caee53
commit c4c97de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/payload/usr/local/sal/bin/sal-submit b/payload/usr/local/sal/bin/sal-submit
@@ -382,9 +382,8 @@ def send_profiles(serial):
 
 def _payload_cleanse(payload):
     stored = ("PayloadIdentifier", "PayloadUUID", "PayloadType")
-    return {k: payload[k] for k in stored}
+    return {k: payload.get(k, "None") for k in stored}
 
 
 if __name__ == "__main__":
     main()
-
diff --git a/payload/usr/local/sal/checkin_modules/profile_checkin.py b/payload/usr/local/sal/checkin_modules/profile_checkin.py
@@ -8,7 +8,6 @@
 
 import sal
 
-
 __version__ = "1.0.0"
 
 
@@ -29,7 +28,7 @@ def main():
         for count, payload in enumerate(payloads, start=1):
             data[f"payload {count}"] = payload
 
-        data["payload_types"] = ", ".join(p["PayloadType"] for p in payloads)
+        data["payload_types"] = ", ".join(p.get("PayloadType", "None") for p in payloads)
         data["profile_description"] = profile.get("ProfileDescription", "None")
         data["identifier"] = profile["ProfileIdentifier"]
         data["organization"] = profile.get("ProfileOrganization" or "None")