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
9b87bd44
"p/haskell-glob/merge_requests" did not exist on "master"
Commit
9b87bd44
authored
7 years ago
by
Ximin Luo
Browse files
Options
Downloads
Patches
Plain Diff
comparators/deb: if --force-details then don't skip files with identical md5sums either
parent
0fb6d8ab
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
diffoscope/comparators/deb.py
+3
-1
3 additions, 1 deletion
diffoscope/comparators/deb.py
diffoscope/comparators/utils/compare.py
+3
-1
3 additions, 1 deletion
diffoscope/comparators/utils/compare.py
with
6 additions
and
2 deletions
diffoscope/comparators/deb.py
+
3
−
1
View file @
9b87bd44
...
...
@@ -20,6 +20,7 @@
import
re
import
logging
from
diffoscope.config
import
Config
from
diffoscope.difference
import
Difference
from
.tar
import
TarContainer
...
...
@@ -167,7 +168,8 @@ class DebTarContainer(TarContainer):
other_md5sums
=
other
.
source
.
container
.
source
.
container
.
source
.
md5sums
for
my_member
,
other_member
,
comment
in
super
().
comparisons
(
other
):
if
my_member
.
name
==
other_member
.
name
and
\
if
not
Config
().
force_details
and
\
my_member
.
name
==
other_member
.
name
and
\
my_md5sums
.
get
(
my_member
.
name
,
'
my
'
)
==
other_md5sums
.
get
(
other_member
.
name
,
'
other
'
):
logger
.
debug
(
"
Skip %s: identical md5sum
"
,
my_member
.
name
)
continue
...
...
This diff is collapsed.
Click to expand it.
diffoscope/comparators/utils/compare.py
+
3
−
1
View file @
9b87bd44
...
...
@@ -82,9 +82,11 @@ def compare_files(file1, file2, source=None, diff_content_only=False):
has_same_content
=
file1
.
has_same_content_as
(
file2
)
if
has_same_content
:
if
not
force_details
or
diff_content_only
:
if
not
force_details
:
logger
.
debug
(
"
has_same_content_as returned True; skipping further comparisons
"
)
return
None
if
diff_content_only
:
return
None
elif
diff_content_only
:
assert
not
has_same_content
return
Difference
(
None
,
file1
.
name
,
file2
.
name
,
comment
=
"
Files differ
"
)
...
...
This diff is collapsed.
Click to expand it.
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