devscripts: update package and fix test.
This commit is contained in:
parent
77135136c7
commit
3574fae6de
2 changed files with 18 additions and 2 deletions
17
helpers/DATA/devscripts/fix_script_reproducible-check.patch
Normal file
17
helpers/DATA/devscripts/fix_script_reproducible-check.patch
Normal file
|
|
@ -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))
|
||||||
|
|
||||||
|
|
@ -26,8 +26,7 @@ VERSION=2
|
||||||
sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|' scripts/debchange.pl
|
sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|' scripts/debchange.pl
|
||||||
|
|
||||||
#Prevent debian test failing.
|
#Prevent debian test failing.
|
||||||
sed -i '/verifyGuessedDistribution/s|buster-backports|bookworm-backports|g' test/test_debchange
|
patch_p1 $DATA/fix_script_reproducible-check.patch
|
||||||
rm scripts/devscripts/test/test_flake8.py
|
|
||||||
|
|
||||||
changelog "Make use of TrisquelDistroInfo from distro-info package."
|
changelog "Make use of TrisquelDistroInfo from distro-info package."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue