[arch-commits] Commit in eclipse/trunk (PKGBUILD commonify)

[Jan Steffens]

    Date: Wednesday, October 11, 2017 @ 20:41:58
  Author: heftig
Revision: 307517

4.7.1.a-1

Modified:
  eclipse/trunk/PKGBUILD
  eclipse/trunk/commonify

-----------+
 PKGBUILD  |   26 +++++++++++++-------------
 commonify |   11 +++++------
 2 files changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-11 18:43:26 UTC (rev 307516)
+++ PKGBUILD	2017-10-11 20:41:58 UTC (rev 307517)
@@ -8,9 +8,9 @@
 
 pkgbase=eclipse
 pkgname=(eclipse-{common,java,jee,cpp,php,javascript})
-pkgver=4.7.1
+pkgver=4.7.1.a
 pkgrel=1
-_release=oxygen-1
+_release=oxygen-1a
 pkgdesc="Highly extensible IDE"
 license=(EPL)
 arch=(i686 x86_64)
@@ -30,19 +30,19 @@
   eval "package_$_pkg() { _package $_pkg; }"
 done
 
-sha256sums=('a5a5cb8a8b86bd8bb98692c4553abd84592aac2438621d8273c43715a115e2ac'
+sha256sums=('9e5573f7b951774be3f98c69f9d391ddafbe8a3a727ce81c08dfd67d42cee503'
             '04e789fb695d5f95d09ddb994ae30397b39aee35f11997465dd91d129c41b2ed'
             '57559c2548ae463089acb3c2825ebc002ed83067ddc953b23d36a7b5a02deaf3')
-sha256sums_i686=('b118ab3186ace6e2b2ff27bfe9cc3dd183fff65d67968e45fd202f4fc9309c90'
-                 '9fbe5d8986bfcd9764456b2f47acea3fb90ee7e68e736725dedf054778fac0e9'
-                 'e58286ead68458c5f8476377ff313f7dff058499305097e6a69de5796b0531e2'
-                 '918a80302fe35787df1a17df7165b25fe66f27ce5af55510cb581aa099665706'
-                 'b5606c483612111d019e411fc472645477f077939c3261d4f2e6015eb3924f7f')
-sha256sums_x86_64=('b569d1b7d5dd57c752272ef4d3455d740ec93d012dddfbd2fad841d6c4eb81b9'
-                   'c2435e8f52fbe94859e8786d3c631c3c3b592c5f58d4c49de615fc414f6dfe3c'
-                   '1c8f20798afc6027913d49ff1cda836b9943b56e38bfdcd507e96232f34f0ae6'
-                   '465caf1a55d0486d68d5a6a280342adebad3bc4ec31dc7e045b8056b46dd0695'
-                   '7523a965e18e6fba195fe0d463a33b44ed7682ff7c9d58a1e906a570ba205e5a')
+sha256sums_i686=('9ffb8980f1f5e68ee6779c9f02376040ace2dec76d8be6407e0d2c77c1c3100b'
+                 '9752f15435a417c03bb75313ee94a4dc3b35adcdd300af055a6f7aa9311225a5'
+                 'eb8462e778034dd4c8e5fcb538d271300730fd7584fe7c2c5e2d53541ee453c8'
+                 'ac6d167124aaad5fb8629802ce5e7acfa57848fc5c7854d068ecd9cd19719ca8'
+                 '65a536d0ce3b41a0c8471167085757eee49b4ebeb04b68929af6475ac465aa5b')
+sha256sums_x86_64=('f1b8205abec2dc9cc769941fbde96bb83007050841d7f094dcb3cb07b1696446'
+                   '7c6bf1640c2ed9db3717cf2c65cecd5f18c3736b46151caa09cd28397516f08b'
+                   'a155afe0b305a1206efb463123f68f48be3900e694f4c7fffa0643e1424511cf'
+                   '6b90524ec4f075ed382f14c598c817df1764f31bebbf4b1ba9bdd4056033eaf3'
+                   'af546dd94f7376dced761970ab0a0f31508fc0ec06e51282a02f5df96748918c')
 
 prepare() {
   mkdir eclipse-common

Modified: commonify
===================================================================
--- commonify	2017-10-11 18:43:26 UTC (rev 307516)
+++ commonify	2017-10-11 20:41:58 UTC (rev 307517)
@@ -36,9 +36,7 @@
 
 
 class DiffError(RuntimeError):
-    def __init__(self, file1, file2):
-        self.file1 = file1
-        self.file2 = file2
+    pass
 
 
 async def diff(file1, file2):
@@ -54,7 +52,7 @@
                 pass
 
     if ret != 0:
-        raise DiffError(file1, file2)
+        raise DiffError()
 
 
 async def identical(files):
@@ -65,7 +63,6 @@
     try:
         await fut
     except DiffError as e:
-        logger.info("Divergent files: %s <> %s", e.file1, e.file2)
         return False
     else:
         return True
@@ -84,7 +81,9 @@
     if await identical(files):
         commonify_file(common_file, files)
         return 1
-    return 0
+    else:
+        logger.info("Divergent file: %s", common_file)
+        return 0
 
 
 def arg_dir(s):