Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
diffoscope
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reproducible Builds
diffoscope
Commits
3f01ab7c
Commit
3f01ab7c
authored
2 years ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Update note for zipinfo/zipinfoverbose. (re.
strip-nondeterminism#19
)
parent
714d0b79
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#378819
passed
2 years ago
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
diffoscope/comparators/zip.py
+12
-2
12 additions, 2 deletions
diffoscope/comparators/zip.py
with
12 additions
and
2 deletions
diffoscope/comparators/zip.py
+
12
−
2
View file @
3f01ab7c
...
...
@@ -120,11 +120,21 @@ class BsdtarVerbose(Command):
def
zipinfo_differences
(
file
,
other
):
"""
Run all our zipinfo variants.
"""
We only return the first kind of metadata command that returns some output.
The compromise here is that
"
zipinfo -v
"
returns more info and, if the .zip
files contain both extended and simple kinds differences, then this logic
will only show the simpler differences.
In practice, this can mean that the values of .zip
"
extra fields
"
can be
hidden (see, for example, reproducible-builds/strip-nondeterminism#19).
This is considered less bad than the inverse (ie. prefering to show the
output of
"
zipinfo -v
"
over merely
"
zipinfo
"
) as this will result in
virtually unreadable diffs in the case that differences when the
differences in the .zip are conventional/common/simple.
"""
for
x
in
(
Zipinfo
,
ZipinfoVerbose
,
BsdtarVerbose
):
result
=
Difference
.
from_operation
(
x
,
file
.
path
,
other
.
path
)
# We only return the 'best' one
if
result
is
not
None
:
return
[
result
]
...
...
This diff is collapsed.
Click to expand it.
Chris Lamb
@lamby
mentioned in issue
strip-nondeterminism#19
·
2 years ago
mentioned in issue
strip-nondeterminism#19
mentioned in issue strip-nondeterminism#19
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment