Hello community, here is the log from the commit of package deluge for openSUSE:Factory checked in at 2016-08-18 09:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deluge (Old) and /work/SRC/openSUSE:Factory/.deluge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deluge" Changes: -------- --- /work/SRC/openSUSE:Factory/deluge/deluge.changes 2016-07-24 19:53:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deluge.new/deluge.changes 2016-08-18 09:18:11.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 17 10:13:36 UTC 2016 - [email protected] + +- Remove deluge-fix-blocklist-crash.patch: fixed in the + libtorrent-rasterbar package. +- Simplify deluge-libtorrent-1.1-geoip.patch. + +------------------------------------------------------------------- Old: ---- deluge-fix-blocklist-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deluge.spec ++++++ --- /var/tmp/diff_new_pack.A1yncZ/_old 2016-08-18 09:18:12.000000000 +0200 +++ /var/tmp/diff_new_pack.A1yncZ/_new 2016-08-18 09:18:12.000000000 +0200 @@ -30,8 +30,6 @@ Patch1: %{name}-update_7z_binary.patch # PATCH-FEATURE-OPENSUSE deluge-libtorrent-1.1-geoip.patch [email protected] -- Use python-GeoIP to get GeoIP data. Patch2: %{name}-libtorrent-1.1-geoip.patch -# PATCH-FIX-OPENSUSE deluge-fix-blocklist-crash.patch -- Workaround a bug in libtorrent-rb 1.1.0 which results in a crash when blocklist is used. -Patch3: %{name}-fix-blocklist-crash.patch BuildRequires: fdupes BuildRequires: gettext BuildRequires: hicolor-icon-theme @@ -68,7 +66,6 @@ %patch0 -p1 %patch1 %patch2 -p1 -%patch3 -p1 %build python2 setup.py build ++++++ deluge-libtorrent-1.1-geoip.patch ++++++ --- /var/tmp/diff_new_pack.A1yncZ/_old 2016-08-18 09:18:12.000000000 +0200 +++ /var/tmp/diff_new_pack.A1yncZ/_new 2016-08-18 09:18:12.000000000 +0200 @@ -20,32 +20,20 @@ def start(self): self.core = component.get("Core") -@@ -496,11 +502,23 @@ class PreferencesManager(component.Compo - log.warning("Unable to find GeoIP database file!") - +@@ -498,9 +504,13 @@ class PreferencesManager(component.Compo if geoip_db: -- try: -- self.session.load_country_db(str(geoip_db)) + try: + self.session.load_country_db(str(geoip_db)) - except Exception, e: - log.error("Unable to load geoip database!") - log.exception(e) -+ if deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("1.1.0"): ++ except (AttributeError, RuntimeError): + try: + self.geoip_instance = GeoIP.open(geoip_db, GeoIP.GEOIP_STANDARD) + except Exception, e: + self.geoip_instance = None + log.error("Unable to load geoip database!") + log.exception(e) -+ else: -+ try: -+ self.session.load_country_db(str(geoip_db)) -+ except AttributeError: -+ try: -+ self.geoip_instance = GeoIP.open(geoip_db, GeoIP.GEOIP_STANDARD) -+ except Exception, e: -+ self.geoip_instance = None -+ log.error("Unable to load geoip database!") -+ log.exception(e) def _on_cache_size(self, key, value): log.debug("%s: %s", key, value) @@ -55,10 +43,10 @@ except UnicodeDecodeError: client = str(peer.client).decode("latin-1") -+ if deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("1.1.0"): -+ country = "" -+ else: ++ try: + country = peer.country ++ except AttributeError: ++ country = "" + + gi = component.get("PreferencesManager").geoip_instance + if gi:
