Skip to content

Commit d2c1052

Browse files
committed
Do not pass reprotest variables to yum tasks
1 parent f454ede commit d2c1052

1 file changed

Lines changed: 14 additions & 8 deletions

File tree

dev/tasks/linux-packages/package-task.rb

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,23 @@ def docker_run(os, architecture, console: false)
149149
run_command_line.concat(["--env", "DEBUG=yes"])
150150
end
151151
pass_through_env_names = [
152-
"CPU_LIST",
153152
"DEB_BUILD_OPTIONS",
154-
"FAKETIME",
155-
"HOME",
156-
"LANG",
157-
"LANGUAGE",
158-
"LC_ALL",
159-
"NO_FAKE_STAT",
160153
"RPM_BUILD_NCPUS",
161-
"TZ",
162154
]
155+
# The following environment variables carry the build variations that
156+
# reprotest injects to verify reproducibility.
157+
if File.basename(Dir.pwd) == apt_dir
158+
pass_through_env_names += [
159+
"CPU_LIST",
160+
"FAKETIME",
161+
"HOME",
162+
"LANG",
163+
"LANGUAGE",
164+
"LC_ALL",
165+
"NO_FAKE_STAT",
166+
"TZ",
167+
]
168+
end
163169
pass_through_env_names.each do |name|
164170
value = ENV[name]
165171
next unless value

0 commit comments

Comments
 (0)