Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix differing jars reported as identical #27

Merged
merged 1 commit into from Aug 21, 2018

Conversation

bmwiedemann
Copy link
Member

because fastjar prints a plain file list

@bmwiedemann
Copy link
Member Author

bmwiedemann commented Aug 3, 2018

This has already occurred in production with jdk updates
https://build.opensuse.org/package/live_build_log/openSUSE:Leap:15.1/xpp3/standard/x86_64

OBS reports

Retried build at Thu Jul  5 14:30:08 2018 returned same result, skipped
Retried build at Mon Jul 16 19:01:28 2018 returned same result, skipped

this was supposed to find

/usr/share/java/META-INF/MANIFEST.MF differs (ASCII text, with CRLF line terminators)
--- old//usr/share/java/META-INF/MANIFEST.MF    2018-08-03 05:17:59.012783126 +0000
+++ new//usr/share/java/META-INF/MANIFEST.MF    2018-08-03 05:17:59.016783149 +0000
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.9.10
-Created-By: 10.0.1+10-suse-lp151.2.1-x8664 (Oracle Corporation)
+Created-By: 10.0.1+10-suse-lp151.2.4-x8664 (Oracle Corporation)

pkg-diff.sh Outdated
@@ -572,7 +572,11 @@ check_single_file()
diff -u old/flist new/flist
return 1
fi
flist=`grep date new/flist | sed -e 's,.* date ,,'`
if [ "$UNJAR" = unzip ] ; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still buggy - the variable is unset because unjar_l is called in a subprocess (because of the | sort)

because fastjar prints a plain file list
@bmwiedemann
Copy link
Member Author

ping

@lnussel lnussel merged commit 131f1a6 into openSUSE:master Aug 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants