Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit osc for openSUSE:Factory
Hello community,

here is the log from the commit of package osc for openSUSE:Factory checked in
at 2019-04-25 16:20:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc (Old)
and /work/SRC/openSUSE:Factory/.osc.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "osc"

Thu Apr 25 16:20:25 2019 rev:131 rq:697466 version:0.165.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/osc/osc.changes 2019-04-23 14:36:02.329472187
+0200
+++ /work/SRC/openSUSE:Factory/.osc.new.5536/osc.changes 2019-04-25
16:20:50.194072396 +0200
@@ -1,0 +2,12 @@
+Wed Apr 24 11:20:12 UTC 2019 - Marco Strigl <marco.strigl@xxxxxxxx>
+
+- osc-0.165.0.tar.gz now contains the correct version (tag 0.165.0)
+
+-------------------------------------------------------------------
+Wed Apr 24 09:55:14 UTC 2019 - Marco Strigl <marco.strigl@xxxxxxxx>
+
+- simplify "BuildArch:" decission if statements. (Avoid double
+ BuildArch lines)
+- Fedora29: m2crypto for python3 is named python3-m2crypto now
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.mLtDkP/_old 2019-04-25 16:20:50.702072305 +0200
+++ /var/tmp/diff_new_pack.mLtDkP/_new 2019-04-25 16:20:50.702072305 +0200
@@ -55,10 +55,10 @@
Requires: rpm-python
%endif
%endif
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1120
+%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
+%if 0%{?suse_version}
Requires: %{use_python}
Recommends: %{use_python}-progressbar
BuildRequires: %{use_python}-xml
@@ -83,8 +83,6 @@
Recommends: obs-service-format_spec_file
Recommends: obs-service-source_validator
%endif
-%else
-BuildArch: noarch
%endif
# needed for storing credentials in kwallet/gnome-keyring
%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
@@ -109,9 +107,14 @@
Requires: python-m2crypto > 0.19
%endif
%else
+%if 0%{?fedora_version} >= 29
+BuildRequires: python3-m2crypto
+Requires: python3-m2crypto
+%else
BuildRequires: m2crypto > 0.19
Requires: m2crypto > 0.19
%endif
+%endif
%if %{with python3}
%define python_sitelib %(python3 -c "from distutils.sysconfig import
get_python_lib; print(get_python_lib())")
%else

++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.mLtDkP/_old 2019-04-25 16:20:50.758072295 +0200
+++ /var/tmp/diff_new_pack.mLtDkP/_new 2019-04-25 16:20:50.758072295 +0200
@@ -1,4 +1,4 @@
-osc (0.164.2) unstable; urgency=low
+osc (0.165.0) unstable; urgency=low
- Update to 0.161.1

-- Marco Strigl <marco.strigl@xxxxxxxx> Thu, 26 Oct 2017 14:42:00 +0200

++++++ osc-0.165.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.165.0/NEWS new/osc-0.165.0/NEWS
--- old/osc-0.165.0/NEWS 2019-04-15 15:20:04.000000000 +0200
+++ new/osc-0.165.0/NEWS 2019-04-18 14:27:42.000000000 +0200
@@ -1,5 +1,5 @@
-0.165
- -
+0.165.0
+ - full python3 compatibility

0.164.2
- deleterequest for entire projects needs the --all option as additional
protection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.165.0/osc/commandline.py
new/osc-0.165.0/osc/commandline.py
--- old/osc-0.165.0/osc/commandline.py 2019-04-15 15:20:04.000000000 +0200
+++ new/osc-0.165.0/osc/commandline.py 2019-04-18 14:27:42.000000000 +0200
@@ -34,6 +34,8 @@
except ImportError:
from .util.helper import cmp_to_key

+from operator import itemgetter
+
MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User
Commands"
.SH NAME
%(name)s \- openSUSE build service command-line tool.
@@ -1032,7 +1034,7 @@
d = '<attributes><attribute namespace=\'%s\' name=\'%s\'
%s</attribute></attributes>' % (aname[0], aname[1], values)
url = makeurl(apiurl, attributepath)
for data in streamfile(url, http_POST, data=d):
- sys.stdout.write(data)
+ sys.stdout.write(decode_it(data))

# upload file
if opts.file:
@@ -7741,11 +7743,12 @@
continue
# construct a sorted, flat list
# Sort by first column, follwed by second column if we have two
columns, else sort by first.
- # results.sort(lambda x, y: ( cmp(x[0], y[0]) or
- # (len(x)>1 and len(y)>1 and cmp(x[1],
y[1])) ))
- results.sort(key=cmp_to_key(compare))
+ if len(results[0]) > 1:
+ sorted_results = sorted(results, key=itemgetter(0,1))
+ else:
+ sorted_results = sorted(results, key=itemgetter(0))
new = []
- for i in results:
+ for i in sorted_results:
new.extend(i)
results = new
headline = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.165.0/osc/core.py new/osc-0.165.0/osc/core.py
--- old/osc-0.165.0/osc/core.py 2019-04-15 15:20:04.000000000 +0200
+++ new/osc-0.165.0/osc/core.py 2019-04-18 14:27:42.000000000 +0200
@@ -5,7 +5,7 @@

from __future__ import print_function

-__version__ = '0.165.git'
+__version__ = '0.165.0'

# __store_version__ is to be incremented when the format of the working copy
# "store" changes in an incompatible way. Please add any needed migration
@@ -7058,7 +7058,7 @@

# for pretty output
xmlindent(s)
- f = open(service_file, 'wb')
+ f = open(service_file, 'w')
f.write(ET.tostring(s, encoding=ET_ENCODING))
f.close()
if addfile:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.165.0/osc/util/helper.py
new/osc-0.165.0/osc/util/helper.py
--- old/osc-0.165.0/osc/util/helper.py 2019-04-15 15:20:04.000000000 +0200
+++ new/osc-0.165.0/osc/util/helper.py 2019-04-18 14:27:42.000000000 +0200
@@ -61,5 +61,9 @@
import chardet
return obj.decode(chardet.detect(obj)['encoding'])
except:
- import locale
- return obj.decode(locale.getlocale()[1])
+ try:
+ import locale
+ return obj.decode(locale.getlocale()[1])
+ except:
+ return obj.decode('latin-1')
+


< Previous Next >
This Thread