Merge ~mitchdz/ubuntu/+source/hibagent:mitch/noble-imdsv2-fix-proposed into ubuntu/+source/hibagent:ubuntu/devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/hibagent-proposed/+packages

[Bryce Harrington (bryce)]

This was already uploaded by Seth, this MP should be updated or closed.

Btw, when making DEP3 metadata for a patch, multi-line Descriptions should have subsequent lines indented to column 2.

Also, if the fix is appropriate for Debian and/or upstream, it should be forwarded and noted in the metadata; if it's not worth forwarding, that is also worth mentioning with the reason why.

review: Approve

[Mitchell Dzurick (mitchdz)]

Thanks Bryce! I was just about to go around and close my MPs.

There is no debian package, and these commits come directly from upstream.

diff --git a/debian/changelog b/debian/changelog
index c056326..f99cc6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hibagent (1.0.1+git20230216.9ac1209f7-0ubuntu3) noble; urgency=medium
+
+  * d/p/hibagent-test-use-importlib.patch: use importlib in
+    test/hibagent_test.py as imp was removed in python3.12 (LP: #2044029).
+
+ -- Mitchell Dzurick <[e-mail]>  Mon, 20 Nov 2023 15:51:14 -0700
+
 hibagent (1.0.1+git20230216.9ac1209f7-0ubuntu2) noble; urgency=medium
 
   * d/p/do-nothing-if-ODH-is-configured.patch: do nothing if ODH is configured,
diff --git a/debian/patches/hibagent-test-use-importlib.patch b/debian/patches/hibagent-test-use-importlib.patch
 new file mode 100644
index 0000000..2469a23
--- /dev/null
+++ b/debian/patches/hibagent-test-use-importlib.patch
@@ -0,0 +1,22 @@
+Description: use importlib instead of imp
+In python3.12, imp is removed. importlib is the replacement.
+Author: Mitchell Dzurick <[e-mail]>
+Last-Update: 2023-11-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/hibagent_test.py
++++ b/test/hibagent_test.py
+@@ -7,10 +7,11 @@
+ from tempfile import mktemp
+ from threading import Thread
+ 
+-import imp
++import importlib.machinery
+ agent_file = os.path.dirname(os.path.abspath(__file__))+"/../../../../agent/hibagent"
+ with open(agent_file) as fl:
+-    hibagent = imp.load_module('hibagent', fl, agent_file, ('py', 'rb', 1))
++    loader = importlib.machinery.SourceFileLoader('hibagent', agent_file)
++    hibagent = loader.load_module()
+ 
+ from time import sleep
+
diff --git a/debian/patches/series b/debian/patches/series
index 0b9774f..f519cd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ fix-enable-ec2-spot-hibernation.patch
 setuptools-fix-package-discovery.patch
 disable-hibernate-test.patch
 do-nothing-if-ODH-is-configured.patch
+hibagent-test-use-importlib.patch