Merge pull request #64 from pop-os/immutable

Fix build in Jammy and some immutable environments
pop-os · Jul 8, 2022 · bdefe03 · bdefe03
2 parents de5b292 + c567d1b
commit bdefe03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kernelstub
 Maintainer: Ian Santopietro <[email protected]>
 Section: python
 Priority: optional
-Build-Depends: python3-all, pyflakes3, debhelper (>= 7.4.3), dh-python
+Build-Depends: python3-all, pyflakes3, debhelper (>= 7.4.3), dh-python, python3-setuptools
 Standards-Version: 3.9.1
 
 Package: kernelstub

diff --git a/kernelstub/kernel_option.py b/kernelstub/kernel_option.py
@@ -46,7 +46,8 @@ def latest_option(path):
     opts = options(path)
     latest_option, latest_version = get_newest_option(opts)
 
-    opts.pop(latest_version)
+    if latest_version is not None:
+        opts.pop(latest_version)
     previous_option = None
     if len(opts) > 0:
         previous_option, latest_version = get_newest_option(opts)

diff --git a/setup.py b/setup.py
@@ -19,8 +19,8 @@
 """
 
 
-from distutils.core import setup
-from distutils.cmd import Command
+from setuptools import setup
+from setuptools import Command
 import os, subprocess, sys
 
 TREE = os.path.dirname(os.path.abspath(__file__))