diff --git a/l2tdevtools/build_helpers/dpkg.py b/l2tdevtools/build_helpers/dpkg.py index 70c4bac2..30861132 100644 --- a/l2tdevtools/build_helpers/dpkg.py +++ b/l2tdevtools/build_helpers/dpkg.py @@ -1,7 +1,6 @@ """Helper for building projects from source.""" import datetime -import fileinput import glob import logging import os @@ -263,23 +262,6 @@ def _CreatePackagingFiles(self, source_directory, project_version): logging.error(f'Missing debian sub directory in: {source_directory:s}') return False - if self.distribution == 'noble': - control_file_path = os.path.join(debian_directory, 'control') - for line in fileinput.input(control_file_path, inplace=True): - if line.startswith('Build-Depends:'): - line = line.rstrip() + ', pybuild-plugin-pyproject\n' - print(line, end='') - - patches_path = os.path.join(debian_directory, 'patches') - if not os.path.exists(patches_path): - os.mkdir(patches_path) - - # pyproject_patch = os.path.join(patches_path, 'pyproject.patch') - # TODO: add option to control patches for noble pyproject.toml builds - - # TODO: create series file - # patches_series = os.path.join(patches_path, 'series') - return True # pylint: disable=redundant-returns-doc,unused-argument @@ -1010,12 +992,12 @@ def Clean(self, source_helper_object): self._RemoveOlderDPKGPackages(project_name, project_version) if project_name.startswith('python-'): - project_name = f'python3-{project_name[7]:s}' + project_name = f'python3-{project_name[7:]:s}' self._RemoveOlderDPKGPackages(project_name, project_version) elif (project_name.startswith('python2-') or project_name.startswith('python3-')): - project_name = f'python3-{project_name[8]:s}' + project_name = f'python3-{project_name[8:]:s}' self._RemoveOlderDPKGPackages(project_name, project_version) diff --git a/l2tdevtools/dpkg_files.py b/l2tdevtools/dpkg_files.py index fdebb345..c8a92847 100644 --- a/l2tdevtools/dpkg_files.py +++ b/l2tdevtools/dpkg_files.py @@ -359,7 +359,7 @@ def _GenerateControlFile(self, dpkg_path): python3_depends.append(f'python3-{dependency[7:]:s}') elif (dependency.startswith('python2-') or dependency.startswith('python3-')): - python3_depends.append(f'python3-{dependency[9:]:s}') + python3_depends.append(f'python3-{dependency[8:]:s}') else: depends.append(dependency) diff --git a/tests/download_helpers/github.py b/tests/download_helpers/github.py index b05ee0ae..065f805c 100644 --- a/tests/download_helpers/github.py +++ b/tests/download_helpers/github.py @@ -168,7 +168,7 @@ class Log2TimelineGitHubReleasesDownloadHelperTest(test_lib.BaseTestCase): _PROJECT_ORGANIZATION = 'log2timeline' _PROJECT_NAME = 'dfvfs' - _PROJECT_VERSION = '20240505' + _PROJECT_VERSION = '20260411' @classmethod def setUpClass(cls):