Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-urlgrabber for
openSUSE:Factory checked in at 2023-03-03 22:28:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-urlgrabber (Old)
and /work/SRC/openSUSE:Factory/.python-urlgrabber.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-urlgrabber"
Fri Mar 3 22:28:26 2023 rev:32 rq:1069119 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-urlgrabber/python-urlgrabber.changes
2022-08-03 21:17:22.787549430 +0200
+++
/work/SRC/openSUSE:Factory/.python-urlgrabber.new.31432/python-urlgrabber.changes
2023-03-03 22:31:33.300069059 +0100
@@ -1,0 +2,13 @@
+Fri Mar 3 08:07:59 UTC 2023 - Matej Cepl <mc...@suse.com>
+
+- Clean up SPEC file
+
+-------------------------------------------------------------------
+Wed Mar 1 16:29:38 UTC 2023 - Pablo Suárez Hernández
<pablo.suarezhernan...@suse.com>
+
+- Raise proper exception from urlgrab() when local file is not found
(bsc#1208288)
+
+- Added:
+ * fix-urlgrab-file-schema-comparison.patch
+
+-------------------------------------------------------------------
New:
----
fix-urlgrab-file-schema-comparison.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-urlgrabber.spec ++++++
--- /var/tmp/diff_new_pack.7jlMkC/_old 2023-03-03 22:31:33.808071225 +0100
+++ /var/tmp/diff_new_pack.7jlMkC/_new 2023-03-03 22:31:33.816071260 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-urlgrabber
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define modname urlgrabber
Name: python-urlgrabber
Version: 4.1.0
@@ -26,12 +25,14 @@
Group: Development/Libraries/Python
URL: https://github.com/rpm-software-management/urlgrabber
Source:
https://github.com/rpm-software-management/%{modname}/releases/download/%{modname}-4-1-0/%{modname}-%{version}.tar.gz
-# PATCH-FIX_UPSTREAM
https://github.com/rpm-software-management/urlgrabber/pull/32
+# PATCH-FIX_UPSTREAM gh#rpm-software-management/urlgrabber!32
Patch0: use-binary-mode-when-reopening-files.patch
-# PATCH-FIX_UPSTREAM
https://github.com/rpm-software-management/urlgrabber/pull/35
+# PATCH-FIX_UPSTREAM gh#rpm-software-management/urlgrabber!35
Patch1: fix_find_proxy_logic_and_drop_six.patch
-# PATCH-FIX_UPSTREAM
https://github.com/rpm-software-management/urlgrabber/pull/34
+# PATCH-FIX_UPSTREAM gh#rpm-software-management/urlgrabber!34
Patch2: avoid_crashing_when_urlgrabber_debug_enabled.patch
+# PATCH-FIX_UPSTREAM gh#rpm-software-management/urlgrabber!37
+Patch3: fix-urlgrab-file-schema-comparison.patch
BuildRequires: %{python_module pycurl}
BuildRequires: %{python_module setuptools}
@@ -74,12 +75,16 @@
%postun
%python_uninstall_alternative urlgrabber
+if [ ! -f %{_libexecdir}/urlgrabber-ext-down ] ; then
+ update-alternatives --remove urlgrabber-ext-down
%{_libexecdir}/urlgrabber-ext-down
+fi
%files %{python_files}
%license LICENSE
%doc ChangeLog README TODO
%python_alternative %{_bindir}/urlgrabber
%python_alternative %{_libexecdir}/urlgrabber-ext-down
-%{python_sitelib}/*
+%{python_sitelib}/urlgrabber
+%{python_sitelib}/urlgrabber-%{version}*-info
%changelog
++++++ fix-urlgrab-file-schema-comparison.patch ++++++
>From 779f65c1845968b59e5bfa21cf0468ba3664271b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernan...@suse.com>
Date: Wed, 1 Mar 2023 14:00:08 +0000
Subject: [PATCH] Fix comparison to work with expected bytes string
The urlgrab function initially coverts given url to bytes string
via the _to_utf8() helper. This make "url" parameter to be bytes,
and therefore we need to fix the this comparison
---
urlgrabber/grabber.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: urlgrabber-4.1.0/urlgrabber/grabber.py
===================================================================
--- urlgrabber-4.1.0.orig/urlgrabber/grabber.py
+++ urlgrabber-4.1.0/urlgrabber/grabber.py
@@ -1210,7 +1210,7 @@ class URLGrabber(object):
if not filename:
# This is better than nothing.
filename = 'index.html'
- if scheme == 'file' and not opts.copy_local:
+ if scheme == b'file' and not opts.copy_local:
# just return the name of the local file - don't make a
# copy currently
path = url2pathname(path)
