diff --git a/helpers/DATA/devscripts/fix_script_reproducible-check.patch b/helpers/DATA/devscripts/fix_script_reproducible-check.patch new file mode 100644 index 0000000..6f6a57e --- /dev/null +++ b/helpers/DATA/devscripts/fix_script_reproducible-check.patch @@ -0,0 +1,17 @@ +--- a/scripts/reproducible-check 2023-04-02 17:44:26+00:00 ++++ b/scripts/reproducible-check 2024-06-21 06:33:30.224688+00:00 +@@ -198,13 +198,13 @@ + + # We may have installed a binNMU version locally so we need to + # strip these off when looking up against the JSON of results. + version = re.sub(r"\+b\d+$", "", pkg_ver.version) + +- result[ +- (pkg.shortname, pkg_ver.architecture, version) +- ] = pkg_ver.source_name ++ result[(pkg.shortname, pkg_ver.architecture, version)] = ( ++ pkg_ver.source_name ++ ) + + self.log.debug("Parsed %d installed binary packages", len(result)) + diff --git a/helpers/make-devscripts b/helpers/make-devscripts index e907dc8..a810b4c 100644 --- a/helpers/make-devscripts +++ b/helpers/make-devscripts @@ -26,8 +26,7 @@ VERSION=2 sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|' scripts/debchange.pl #Prevent debian test failing. -sed -i '/verifyGuessedDistribution/s|buster-backports|bookworm-backports|g' test/test_debchange -rm scripts/devscripts/test/test_flake8.py +patch_p1 $DATA/fix_script_reproducible-check.patch changelog "Make use of TrisquelDistroInfo from distro-info package."