1
0
Fridrich Strba 2024-07-17 07:30:41 +00:00 committed by Git OBS Bridge
parent 5d7f578395
commit 75ad56cab7

View File

@ -1,34 +1,36 @@
From 675aa30a8a763e1a964282937267a63f2594a7e2 Mon Sep 17 00:00:00 2001 From 1f3c0d52b1e0feb42a48aa8ac8de4f3b37465e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 16 Jul 2024 06:56:39 +0200 Date: Tue, 16 Jul 2024 06:56:39 +0200
Subject: [PATCH 8/8] Reproducible builds: constant timestamp for Subject: [PATCH 8/8] Reproducible builds: constant timestamp for
pom.properties pom.properties
--- ---
java-utils/maven_depmap.py | 11 +++++++++-- java-utils/maven_depmap.py | 14 ++++++++++++--
1 file changed, 9 insertions(+), 2 deletions(-) 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 4bfb877d..40cedd34 100644 index 4bfb877d..74860baf 100644
--- a/java-utils/maven_depmap.py --- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py +++ b/java-utils/maven_depmap.py
@@ -43,8 +43,9 @@ import sys @@ -43,7 +43,8 @@ import sys
from os.path import basename, dirname from os.path import basename, dirname
import zipfile import zipfile
-from time import gmtime, strftime -from time import gmtime, strftime
+import time +import time
+import datetime
from copy import deepcopy from copy import deepcopy
+from datetime import datetime
from javapackages.maven.pom import POM from javapackages.maven.pom import POM
from javapackages.metadata.artifact import MetadataArtifact @@ -172,7 +173,16 @@ def append_if_missing(archive_name, file_name, file_contents):
@@ -172,7 +173,13 @@ def append_if_missing(archive_name, file_name, file_contents):
archive = zipfile.ZipFile(archive_name, 'a') archive = zipfile.ZipFile(archive_name, 'a')
try: try:
if file_name not in archive.namelist(): if file_name not in archive.namelist():
- archive.writestr(file_name, file_contents) - archive.writestr(file_name, file_contents)
+ date_time = datetime.fromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).timetuple() + date_time = datetime.datetime.fromtimestamp(
+ int(os.environ.get('SOURCE_DATE_EPOCH', time.time())),
+ tz=datetime.timezone.utc,
+ ).timetuple()
+ if date_time[0] < 1980: + if date_time[0] < 1980:
+ date_time = (1980, 1, 1, 0, 0, 0) + date_time = (1980, 1, 1, 0, 0, 0)
+ elif date_time[0] > 2107: + elif date_time[0] > 2107: