January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit spec-cleaner for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2016-01-26 10:14:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spec-cleaner" Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2015-09-19 06:55:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2016-01-26 10:14:59.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 22 13:42:39 UTC 2016 - tchvatal(a)suse.com + +- Version update to 0.7.5: + * Replace jobs in install section too + * Do not curlify gconf_schemas + * Work with defines in sections not just as global declarations + * Quote optflags properly when replacing RPM_OPT_FLAGS + * Do not add empty line after oneline scriptlet + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.7.4.tar.gz New: ---- spec-cleaner-0.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.4FYDtB/_old 2016-01-26 10:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.4FYDtB/_new 2016-01-26 10:14:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package spec-cleaner # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Vincent Untz <vuntz(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ # This is used for Fedora, we need to sync this %{!?py3_ver: %define py3_ver %{python3_version}} Name: spec-cleaner -Version: 0.7.4 +Version: 0.7.5 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.7.4.tar.gz -> spec-cleaner-0.7.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/.gitignore new/spec-cleaner-spec-cleaner-0.7.5/.gitignore --- old/spec-cleaner-spec-cleaner-0.7.4/.gitignore 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/.gitignore 2016-01-22 14:37:02.000000000 +0100 @@ -3,5 +3,6 @@ .eggs/ *.egg-info/ *.pyc +.*.swp .coverage .coveralls.yml Files old/spec-cleaner-spec-cleaner-0.7.4/data/.licenses_changes.txt.swp and new/spec-cleaner-spec-cleaner-0.7.5/data/.licenses_changes.txt.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.7.5/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.7.4/data/excludes-bracketing.txt 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/data/excludes-bracketing.txt 2016-01-22 14:37:02.000000000 +0100 @@ -25,6 +25,7 @@ files files_fontsconf_file fillup_[^\s]* +find_gconf_schemas find_lang gem_install gem_packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/__init__.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/__init__.py 2016-01-22 14:37:02.000000000 +0100 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.7.4' +__version__ = '0.7.5' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmcleaner.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmcleaner.py 2016-01-22 14:37:02.000000000 +0100 @@ -95,7 +95,7 @@ # WARN: Keep in sync with rpmregexps for rpmpreamble section if not isinstance(self.current_section, RpmPreamble) and \ not isinstance(self.current_section, RpmPackage): - if self.reg.re_define.match(line) or self.reg.re_global.match(line) or \ + if self.reg.re_global.match(line) or \ self.reg.re_bcond_with.match(line) or \ self.reg.re_requires.match(line) or self.reg.re_requires_phase.match(line) or \ self.reg.re_buildrequires.match(line) or self.reg.re_prereq.match(line) or \ @@ -113,6 +113,12 @@ self.reg.re_packager.match(line) or self.reg.re_debugpkg.match(line) or \ self.reg.re_requires_eq.match(line): return True + # We can have local defined variables in phases + if not isinstance(self.current_section, RpmInstall) and \ + not isinstance(self.current_section, RpmBuild) and \ + not isinstance(self.current_section, RpmPrep): + if self.reg.re_define.match(line): + return True return False def _detect_new_section(self, line): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpminstall.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpminstall.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpminstall.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpminstall.py 2016-01-22 14:37:02.000000000 +0100 @@ -21,6 +21,7 @@ if self.reg.re_clean.search(line): return + line = self.reg.re_jobs.sub(parallel_arg, line) # do not use install macros as we have trouble with it for now # we can convert it later on if self.reg.re_install.match(line): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmregexp.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmregexp.py 2016-01-22 14:37:02.000000000 +0100 @@ -87,6 +87,8 @@ # rpmbuild re_jobs = re.compile(r'%{(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}') re_make = re.compile(r'(^|(.*\s)?)make($|(\s.*)?)') + re_optflags_quotes = re.compile(r'=\s*\${?RPM_OPT_FLAGS}?\s*$') + re_optflags = re.compile('\${?RPM_OPT_FLAGS}?') # rpmcopyright re_copyright = re.compile(r'^#\s*Copyright\ $c$\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmscriplets.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmscriplets.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmscriplets.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmscriplets.py 2016-01-22 14:37:02.000000000 +0100 @@ -12,10 +12,16 @@ def output(self, fout, newline=True): # if we have 2 or 3 lines where last one is empty nolines = len(self.lines) + if nolines == 1: + newline=False if nolines == 2 or (nolines == 3 and self.lines[2] == ''): - if self.lines[1] == '/sbin/ldconfig': - pkg = self.lines[0] - self.lines = [] - self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) - self.lines.append('') + newline=False + # if we have two lines and the 2nd is just whitespace, drop it + if self.lines[0] != '' and self.lines[1] == '': + self.lines.pop() + if len(self.lines) >= 2: + if self.lines[1] == '/sbin/ldconfig': + pkg = self.lines[0] + self.lines = [] + self.lines.append('{0} -p /sbin/ldconfig'.format(pkg)) Section.output(self, fout, newline) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmsection.py new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmsection.py --- old/spec-cleaner-spec-cleaner-0.7.4/spec_cleaner/rpmsection.py 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/spec_cleaner/rpmsection.py 2016-01-22 14:37:02.000000000 +0100 @@ -142,8 +142,9 @@ """ Replace RPM_OPT_FLAGS for %{optflags} """ - line = line.replace('${RPM_OPT_FLAGS}', '%{optflags}') - line = line.replace('$RPM_OPT_FLAGS', '%{optflags}') + # if the optflags is the only thing then also add quotes around it + line = self.reg.re_optflags_quotes.sub('="%{optflags}"', line) + line = self.reg.re_optflags.sub('%{optflags}', line) return line def replace_known_dirs(self, line): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/in/makeflags.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/in/makeflags.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/in/makeflags.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/in/makeflags.spec 2016-01-22 14:37:02.000000000 +0100 @@ -1,4 +1,6 @@ %build +export CFLAGS=${RPM_OPT_FLAGS} +export CFLAGS="$RPM_OPT_FLAGS -blabla" make make PREFIX=/ \ STATIC="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/in/makeparams.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/in/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/in/makeparams.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/in/makeparams.spec 2016-01-22 14:37:02.000000000 +0100 @@ -58,3 +58,4 @@ make install DESTDIR=$RPM_BUILD_ROOT %make_install %{make_install} +%{__make} install %{?jobs:-j%{jobs}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/in/scriplets.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/in/scriplets.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/in/scriplets.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/in/scriplets.spec 2016-01-22 14:37:02.000000000 +0100 @@ -3,9 +3,9 @@ %post /sbin/ldconfig -%post -n %{_libname} -/sbin/ldconfig - %post /sbin/ldconfig someothercommand + +%post -n %{_libname} +/sbin/ldconfig \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/in/sectiondefine.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/in/sectiondefine.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/in/sectiondefine.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/in/sectiondefine.spec 2016-01-22 14:37:02.000000000 +0100 @@ -0,0 +1,27 @@ +%build +# This is for build debugging purposed +export OIIOINC=`echo $PWD` +%define pwd $OIIOINC +%define oiioinclude %{pwd}/src/include +echo %{pwd} +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +mkdir -p build +cd build +cmake \ +%ifarch ppc ppc64 + -DNOTHREADS=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DPYLIB_INSTALL_DIR=%{python_sitearch} \ + -DINSTALL_DOCS:BOOL=ON \ + -DDOC_INSTALL_DIR=%{_docdir}/%{name} \ + -DINSTALL_FONTS:BOOL=ON \ + -DBUILDSTATIC:BOOL=OFF \ + -DLINKSTATIC:BOOL=OFF \ + -DUSE_EXTERNAL_PUGIXML:BOOL=ON \ + -DUSE_FFMPEG:BOOL=OFF \ + -DUSE_OPENSSL:BOOL=ON \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out/makeflags.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out/makeflags.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out/makeflags.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out/makeflags.spec 2016-01-22 14:37:02.000000000 +0100 @@ -17,6 +17,8 @@ %build +export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -blabla" make %{?_smp_mflags} make PREFIX=/ \ STATIC="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out/makeparams.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out/makeparams.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out/makeparams.spec 2016-01-22 14:37:02.000000000 +0100 @@ -76,4 +76,5 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %make_install %make_install +make DESTDIR=%{buildroot} install %{?_smp_mflags} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out/scriplets.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out/scriplets.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out/scriplets.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out/scriplets.spec 2016-01-22 14:37:02.000000000 +0100 @@ -17,12 +17,9 @@ %post -n %{libname} -p /sbin/ldconfig - %post -p /sbin/ldconfig - -%post -n %{_libname} -p /sbin/ldconfig - %post /sbin/ldconfig someothercommand +%post -n %{_libname} -p /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out/sectiondefine.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out/sectiondefine.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out/sectiondefine.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out/sectiondefine.spec 2016-01-22 14:37:02.000000000 +0100 @@ -0,0 +1,47 @@ +# +# spec file for package sectiondefine +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%build +# This is for build debugging purposed +export OIIOINC=`echo $PWD` +%define pwd $OIIOINC +%define oiioinclude %{pwd}/src/include +echo %{pwd} +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +mkdir -p build +cd build +# FIXME: you should use %%cmake macros +cmake \ +%ifarch ppc ppc64 + -DNOTHREADS=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DPYLIB_INSTALL_DIR=%{python_sitearch} \ + -DINSTALL_DOCS:BOOL=ON \ + -DDOC_INSTALL_DIR=%{_docdir}/%{name} \ + -DINSTALL_FONTS:BOOL=ON \ + -DBUILDSTATIC:BOOL=OFF \ + -DLINKSTATIC:BOOL=OFF \ + -DUSE_EXTERNAL_PUGIXML:BOOL=ON \ + -DUSE_FFMPEG:BOOL=OFF \ + -DUSE_OPENSSL:BOOL=ON \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + .. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/makeflags.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/makeflags.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/makeflags.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/makeflags.spec 2016-01-22 14:37:02.000000000 +0100 @@ -17,6 +17,8 @@ %build +export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -blabla" make make PREFIX=/ \ STATIC="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/makeparams.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/makeparams.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/makeparams.spec 2016-01-22 14:37:02.000000000 +0100 @@ -76,4 +76,5 @@ make install DESTDIR=%{buildroot} %make_install %make_install +make install %{?jobs:-j%{jobs}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/scriplets.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/scriplets.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/scriplets.spec 2015-09-17 14:36:03.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/scriplets.spec 2016-01-22 14:37:02.000000000 +0100 @@ -21,10 +21,10 @@ %post /sbin/ldconfig -%post -n %{_libname} -/sbin/ldconfig - %post /sbin/ldconfig someothercommand +%post -n %{_libname} +/sbin/ldconfig + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/sectiondefine.spec new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/sectiondefine.spec --- old/spec-cleaner-spec-cleaner-0.7.4/tests/out-minimal/sectiondefine.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.7.5/tests/out-minimal/sectiondefine.spec 2016-01-22 14:37:02.000000000 +0100 @@ -0,0 +1,46 @@ +# +# spec file for package sectiondefine +# +# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%build +# This is for build debugging purposed +export OIIOINC=`echo $PWD` +%define pwd $OIIOINC +%define oiioinclude %{pwd}/src/include +echo %{pwd} +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +mkdir -p build +cd build +cmake \ +%ifarch ppc ppc64 + -DNOTHREADS=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DPYLIB_INSTALL_DIR=%{python_sitearch} \ + -DINSTALL_DOCS:BOOL=ON \ + -DDOC_INSTALL_DIR=%{_docdir}/%{name} \ + -DINSTALL_FONTS:BOOL=ON \ + -DBUILDSTATIC:BOOL=OFF \ + -DLINKSTATIC:BOOL=OFF \ + -DUSE_EXTERNAL_PUGIXML:BOOL=ON \ + -DUSE_FFMPEG:BOOL=OFF \ + -DUSE_OPENSSL:BOOL=ON \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + .. +

1 0

commit mate-terminal for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package mate-terminal for openSUSE:Factory checked in at 2016-01-26 10:14:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-terminal (Old) and /work/SRC/openSUSE:Factory/.mate-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-terminal/mate-terminal.changes 2015-12-06 07:43:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-terminal.new/mate-terminal.changes 2016-01-26 10:14:58.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 22 12:34:23 UTC 2016 - sor.alexei(a)meowr.ru + +- Fix gschemas compilation in %post. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-terminal.spec ++++++ --- /var/tmp/diff_new_pack.sqUK50/_old 2016-01-26 10:14:59.000000000 +0100 +++ /var/tmp/diff_new_pack.sqUK50/_new 2016-01-26 10:14:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-terminal # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -70,7 +70,7 @@ %post %desktop_database_post -%glib2_gsettings_schema_postun +%glib2_gsettings_schema_post %postun %desktop_database_postun

1 0

commit spacefm for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package spacefm for openSUSE:Factory checked in at 2016-01-26 10:14:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spacefm (Old) and /work/SRC/openSUSE:Factory/.spacefm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spacefm" Changes: -------- --- /work/SRC/openSUSE:Factory/spacefm/spacefm.changes 2015-10-22 12:59:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spacefm.new/spacefm.changes 2016-01-26 10:14:56.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Jan 21 16:35:27 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 1.0.5: + * Recreate too small cached thumbnails. + * Read $XDG_TEMPLATES_DIR via glib for user-dirs.dirs support. + * Devices|Settings|Auto-Mount|Mount Dirs accept XDG vars, mkdir. + * Fix Paste in directory tree pastes to a wrong directory. + * Menu key in directory tree changes directory and acts on the + correct directory. + * [desktop] Show video thumbnails on desktop. + * Preferences add 384x384 icon size option. + * Obey StartupNotify when opening with an desktop application. + * configure.ac set G_LOG_DOMAIN. + * Fix main.c debug_gdk_threads_leave. + * Change detection, blacklist detect new files. + * Get mime type of only reg and link files, not char dev. + * Fix segfault in ptk_bookmark_view_reload_list to vfs_load_icon. + * Prevent filesystem find loop hang in new file/directory dialog. + * Fix crash on GTK+ icon theme reload; fix liststore memory leaks. + * udevil iso unmount device handler new whitelist/blacklist. + * Fix broken key shortcuts in Open|In Panel menu. + * Add lxqt-sudo and lxsu to list of su frontends. + * Add support for qterminal in list of terminals. + * Make Paste As Target paste canonicalised final target when + possible. + +------------------------------------------------------------------- Old: ---- spacefm-1.0.4.tar.gz New: ---- spacefm-1.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spacefm.spec ++++++ --- /var/tmp/diff_new_pack.4iuRpa/_old 2016-01-26 10:14:57.000000000 +0100 +++ /var/tmp/diff_new_pack.4iuRpa/_new 2016-01-26 10:14:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package spacefm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with gtk2 %bcond_with restricted Name: spacefm -Version: 1.0.4 +Version: 1.0.5 Release: 0 Summary: Multi-panel tabbed file and desktop manager License: GPL-3.0+ and LGPL-3.0+ ++++++ spacefm-1.0.4.tar.gz -> spacefm-1.0.5.tar.gz ++++++ ++++ 5960 lines of diff (skipped)

1 0

commit yast2-live-installer for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package yast2-live-installer for openSUSE:Factory checked in at 2016-01-26 10:14:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-live-installer (Old) and /work/SRC/openSUSE:Factory/.yast2-live-installer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-live-installer" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-live-installer/yast2-live-installer.changes 2014-12-05 21:04:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-live-installer.new/yast2-live-installer.changes 2016-01-26 10:14:55.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 13 18:37:12 UTC 2016 - mfilka(a)suse.com + +- dropped unused inst client +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-live-installer-3.1.4.tar.bz2 New: ---- yast2-live-installer-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-live-installer.spec ++++++ --- /var/tmp/diff_new_pack.5p4vf0/_old 2016-01-26 10:14:56.000000000 +0100 +++ /var/tmp/diff_new_pack.5p4vf0/_new 2016-01-26 10:14:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-live-installer # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-live-installer -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-live-installer-3.1.4.tar.bz2 -> yast2-live-installer-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-live-installer-3.1.4/CONTRIBUTING.md new/yast2-live-installer-3.1.5/CONTRIBUTING.md --- old/yast2-live-installer-3.1.4/CONTRIBUTING.md 2014-12-04 11:13:02.000000000 +0100 +++ new/yast2-live-installer-3.1.5/CONTRIBUTING.md 2015-04-17 10:02:12.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-message…. -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#refe… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-live-installer-3.1.4/package/yast2-live-installer.changes new/yast2-live-installer-3.1.5/package/yast2-live-installer.changes --- old/yast2-live-installer-3.1.4/package/yast2-live-installer.changes 2014-12-04 11:13:02.000000000 +0100 +++ new/yast2-live-installer-3.1.5/package/yast2-live-installer.changes 2016-01-22 10:56:14.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 18:37:12 UTC 2016 - mfilka(a)suse.com + +- dropped unused inst client +- 3.1.5 + +------------------------------------------------------------------- Thu Dec 4 09:50:25 UTC 2014 - jreidinger(a)suse.com - remove X-KDE-Library from desktop file (bnc#899104) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-live-installer-3.1.4/package/yast2-live-installer.spec new/yast2-live-installer-3.1.5/package/yast2-live-installer.spec --- old/yast2-live-installer-3.1.4/package/yast2-live-installer.spec 2014-12-04 11:13:02.000000000 +0100 +++ new/yast2-live-installer-3.1.5/package/yast2-live-installer.spec 2016-01-22 10:56:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-live-installer -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-live-installer-3.1.4/src/Makefile.am new/yast2-live-installer-3.1.5/src/Makefile.am --- old/yast2-live-installer-3.1.4/src/Makefile.am 2014-12-04 11:13:02.000000000 +0100 +++ new/yast2-live-installer-3.1.5/src/Makefile.am 2016-01-22 10:56:14.000000000 +0100 @@ -14,7 +14,6 @@ clients/live-installer.rb \ clients/inst_live_pre-proposal.rb \ clients/live_save_config_finish.rb \ - clients/inst_live_prepare_net_test.rb \ clients/inst_live_full_proposal.rb \ clients/live_runme_at_boot_finish.rb @@ -23,4 +22,4 @@ EXTRA_DIST = $(module_DATA) $(client_DATA) $(desktop_DATA) -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-live-installer-3.1.4/src/clients/inst_live_prepare_net_test.rb new/yast2-live-installer-3.1.5/src/clients/inst_live_prepare_net_test.rb --- old/yast2-live-installer-3.1.4/src/clients/inst_live_prepare_net_test.rb 2014-12-04 11:13:03.000000000 +0100 +++ new/yast2-live-installer-3.1.5/src/clients/inst_live_prepare_net_test.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -# encoding: utf-8 - -# *************************************************************************** -# -# Copyright (c) 2002 - 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -# *************************************************************************** -# File: clients/inst_live_prepare_net_test.ycp -# Package: Network configuration -# Summary: Configuration dialogs for installation -# Authors: Michal Svec <msvec(a)suse.cz> -# Arvin Schnell <arvin(a)suse.de> -# -# $Id: inst_ask_net_test.ycp 27667 2006-02-07 10:33:15Z mvidner $ -module Yast - class InstLivePrepareNetTestClient < Client - def main - Yast.import "UI" - - textdomain "network" - - Yast.import "GetInstArgs" - Yast.import "InternetDevices" - Yast.import "Mode" - - Yast.include self, "network/routines.rb" - Yast.include self, "network/installation/dialogs.rb" - - return :auto if GetInstArgs.going_back - - if Mode.update - # FIXME should be made somewhere else - - Builtins.y2milestone("starting network") - SCR.Execute(path(".target.bash"), "/sbin/rcnetwork start") - Builtins.sleep(1) - end - - # Nothing to test - if !InternetDevices.FindFastest - Internet.do_test = false - return :auto - end - - :next - - # EOF - end - end -end - -Yast::InstLivePrepareNetTestClient.new.main

1 0

commit nvml for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package nvml for openSUSE:Factory checked in at 2016-01-26 10:14:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvml (Old) and /work/SRC/openSUSE:Factory/.nvml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nvml" Changes: -------- --- /work/SRC/openSUSE:Factory/nvml/nvml.changes 2015-10-20 00:08:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nvml.new/nvml.changes 2016-01-26 10:14:54.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Jan 22 09:16:47 UTC 2016 - jthumshirn(a)suse.com + +- Update to upstream version 0.4 + This NVML version primarily focuses on improving code quality + and reliability. In addition to a couple of bug fixes, + the changes include: + - benchmarks for libpmemobj, libpmemblk and libvmem + - additional pmemobj tests and examples + - pool mapping address randomization + - added pmempool "rm" command + - eliminated libpmem dependency on libpthread + - enabled extra warnings + - minor performance improvements + Man pages are all complete. + This release is considered "Beta quality" by the team, having + been thoroughly validated, including significant performance analysis. + The pmempool command does not yet support "check" and "repair" + operations for pmemobj type pools. + +------------------------------------------------------------------- Old: ---- 0.3.tar.gz New: ---- 0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvml.spec ++++++ --- /var/tmp/diff_new_pack.P8UY3V/_old 2016-01-26 10:14:54.000000000 +0100 +++ /var/tmp/diff_new_pack.P8UY3V/_new 2016-01-26 10:14:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nvml # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: nvml -Version: 0.3 +Version: 0.4 Release: 0 Summary: Non-Volatile Memory Library License: BSD-3-Clause @@ -196,7 +196,7 @@ %install b="%buildroot" -make install DESTDIR="$b" +make install DESTDIR="$b" prefix="%_prefix" rm -f "$b/%_libdir"/*.a "$b/%_libdir/nvml_debug"/*.a mkdir -p "$b/%_datadir/nvml" cp utils/nvml.magic "$b/%_datadir/nvml/" @@ -231,6 +231,7 @@ %_mandir/man1/pmempool-create.1* %_mandir/man1/pmempool-dump.1* %_mandir/man1/pmempool-check.1* +%_mandir/man1/pmempool-rm.1* %doc LICENSE %files -n libpmem1 ++++++ 0.3.tar.gz -> 0.4.tar.gz ++++++ ++++ 50931 lines of diff (skipped)

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-01-26 10:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-01-22 01:09:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-01-26 10:14:52.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Jan 22 08:27:55 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.2.0+git.1453451184.2fbd420: + + high: history: Parse log lines without timestamp (bsc#955581) + + high: scripts: Improved OCFS2 cluster script (bsc#953984) + + high: scripts: Add NFS on LVM and DRBD cluster script (bsc#951132) + + high: scripts: Add LVM on DRBD cluster script (bsc#951132) + + high: scripts: fix broken cluster init script (bsc#963135) + + medium: scripts: Updated SBD cluster script + + medium: ui_configure: Rename show-property to get-property + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 New: ---- crmsh-2.2.0+git.1453451184.2fbd420.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.jhnNXK/_old 2016-01-26 10:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.jhnNXK/_new 2016-01-26 10:14:53.000000000 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0+git.1452874360.0988ac4 +Version: 2.2.0+git.1453451184.2fbd420 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.jhnNXK/_old 2016-01-26 10:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.jhnNXK/_new 2016-01-26 10:14:53.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">0988ac4d1d2b42a705640bd946f3eb9420258d65</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2fbd420746e62e1b727472a2a1beb0a95b560b4a</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0+git.1452874360.0988ac4.tar.bz2 -> crmsh-2.2.0+git.1453451184.2fbd420.tar.bz2 ++++++ ++++ 6238 lines of diff (skipped)

1 0

commit python-apache-libcloud for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package python-apache-libcloud for openSUSE:Factory checked in at 2016-01-26 10:14:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-apache-libcloud (Old) and /work/SRC/openSUSE:Factory/.python-apache-libcloud.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-apache-libcloud" Changes: -------- --- /work/SRC/openSUSE:Factory/python-apache-libcloud/python-apache-libcloud.changes 2016-01-01 19:50:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-apache-libcloud.new/python-apache-libcloud.changes 2016-01-26 10:14:50.000000000 +0100 @@ -1,0 +2,28 @@ +Wed Jan 20 20:58:45 UTC 2016 - aboe76(a)gmail.com + +- Updated to apache libcloud 0.20.1 +- General: + - Introduction of container based drivers for Docker, Rkt and Container-as-a-service providers + (LIBCLOUD-781, GITHUB-666) [Anthony Shaw] + - Introduce a new libcloud.backup API for Backup as a Service projects and products. + (GITHUB-621) [Anthony Shaw] + - Also retry failed HTTP(s) requests upon transient “read operation timed out” SSL error. + (GITHUB-556, LIBCLOUD-728) [Scott Kruger] + - Throw a more user-friendly exception if a client fails to establish SSL / TLS connection + with a server because of an unsupported SSL / TLS version. (GITHUB-682) [Tomaz Muraus] +- Compute: + - Add ap-northeast-2 region to EC2 driver (South Korea) (GITHUB-681) [Anthony Shaw] + - Added Added volume type to EC2 volume extra to EC2 driver. (GITHUB-680) [Gennadiy Stas] + - Add LazyObject class that provides lazy-loading, see GCELicense for usage (LIBCLOUD-786, + GITHUB-665) [Scott Crunkleton] + - Added t2.nano instance type to EC2 Compute driver (GITHUB-663) [Anthony Shaw] + - Support for passing the image ID as a string instead of an instance of image when creating + nodes in Dimension Data driver. (GITHUB-664) [Anthony Shaw] +- DNS: + - Add support for ‘health checks’ in Aurora DNS driver (GITHUB-672) [Wido den Hollander] + - Make sure ttl attribute is correctly parsed and added to the Record extra dictionary. + (GITHUB-675) [Wido den Hollander] + - Improve unit tests of Aurora DNS driver (GITHUB-679) [Wido den Hollander] + + +------------------------------------------------------------------- Old: ---- apache-libcloud-0.20.0.tar.bz2 New: ---- apache-libcloud-0.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-apache-libcloud.spec ++++++ --- /var/tmp/diff_new_pack.1cCSXB/_old 2016-01-26 10:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.1cCSXB/_new 2016-01-26 10:14:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-apache-libcloud -Version: 0.20.0 +Version: 0.20.1 Release: 0 Summary: Abstract away differences among multiple cloud provider APIs License: Apache-2.0 ++++++ apache-libcloud-0.20.0.tar.bz2 -> apache-libcloud-0.20.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/CHANGES.rst new/apache-libcloud-0.20.1/CHANGES.rst --- old/apache-libcloud-0.20.0/CHANGES.rst 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/CHANGES.rst 2016-01-15 20:28:20.000000000 +0100 @@ -1,8 +1,18 @@ Changelog ========= +Changes with Apache Libcloud 0.20.1 +----------------------------------- + +Compute +~~~~~~~ + +- [google] Allow for old and new style service account client email address + (LIBCLOUD-785) + [Hoang Phan] + Changes with Apache Libcloud 0.20.0 -------------------------------------------- +----------------------------------- General ~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/PKG-INFO new/apache-libcloud-0.20.1/PKG-INFO --- old/apache-libcloud-0.20.0/PKG-INFO 2015-12-09 12:16:32.000000000 +0100 +++ new/apache-libcloud-0.20.1/PKG-INFO 2016-01-15 20:31:53.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: apache-libcloud -Version: 0.20.0 +Version: 0.20.1 Summary: A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see http://libcloud.apache.org Home-page: http://libcloud.apache.org/ Author: Apache Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/apache_libcloud.egg-info/PKG-INFO new/apache-libcloud-0.20.1/apache_libcloud.egg-info/PKG-INFO --- old/apache-libcloud-0.20.0/apache_libcloud.egg-info/PKG-INFO 2015-12-09 12:16:31.000000000 +0100 +++ new/apache-libcloud-0.20.1/apache_libcloud.egg-info/PKG-INFO 2016-01-15 20:31:53.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: apache-libcloud -Version: 0.20.0 +Version: 0.20.1 Summary: A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see http://libcloud.apache.org Home-page: http://libcloud.apache.org/ Author: Apache Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/__init__.py new/apache-libcloud-0.20.1/libcloud/__init__.py --- old/apache-libcloud-0.20.0/libcloud/__init__.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/__init__.py 2016-01-15 16:31:36.000000000 +0100 @@ -20,7 +20,7 @@ """ __all__ = ['__version__', 'enable_debug'] -__version__ = '0.20.0' +__version__ = '0.20.1' import os import codecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/common/dimensiondata.py new/apache-libcloud-0.20.1/libcloud/common/dimensiondata.py --- old/apache-libcloud-0.20.0/libcloud/common/dimensiondata.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/common/dimensiondata.py 2016-01-15 16:22:37.000000000 +0100 @@ -298,7 +298,7 @@ return (('<DimensionDataStatus: action=%s, request_time=%s, ' 'user_name=%s, number_of_steps=%s, update_time=%s, ' 'step_name=%s, step_number=%s, ' - 'step_percent_complete=%s, failure_reason=%s') + 'step_percent_complete=%s, failure_reason=%s>') % (self.action, self.request_time, self.user_name, self.number_of_steps, self.update_time, self.step_name, self.step_number, self.step_percent_complete, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/common/google.py new/apache-libcloud-0.20.1/libcloud/common/google.py --- old/apache-libcloud-0.20.0/libcloud/common/google.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/common/google.py 2016-01-15 16:22:55.000000000 +0100 @@ -607,7 +607,7 @@ @staticmethod def _is_sa(user_id): - return user_id.endswith('@developer.gserviceaccount.com') + return user_id.endswith('.gserviceaccount.com') class GoogleBaseConnection(ConnectionUserAndKey, PollingConnection): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/compute/drivers/dimensiondata.py new/apache-libcloud-0.20.1/libcloud/compute/drivers/dimensiondata.py --- old/apache-libcloud-0.20.0/libcloud/compute/drivers/dimensiondata.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/compute/drivers/dimensiondata.py 2016-01-15 16:22:24.000000000 +0100 @@ -873,7 +873,7 @@ block_id = None for info in findall(response, 'info', TYPES_URN): - if info.get('name') == 'publicIpBlockId': + if info.get('name') == 'ipBlockId': block_id = info.get('value') return self.ex_get_public_ip_block(block_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/compute/drivers/vcloud.py new/apache-libcloud-0.20.1/libcloud/compute/drivers/vcloud.py --- old/apache-libcloud-0.20.0/libcloud/compute/drivers/vcloud.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/compute/drivers/vcloud.py 2016-01-15 16:22:15.000000000 +0100 @@ -848,7 +848,8 @@ 'application/vnd.vmware.vcloud.orgList+xml')).get('href') ) - self.connection.set_http_proxy(self.proxy_url) + if self.proxy_url: + self.connection.set_http_proxy(self.proxy_url) self.connection.request(method='GET', url=org_list_url, headers=self.add_default_headers({})) body = ET.XML(self.connection.getresponse().read()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/dns/drivers/rackspace.py new/apache-libcloud-0.20.1/libcloud/dns/drivers/rackspace.py --- old/apache-libcloud-0.20.0/libcloud/dns/drivers/rackspace.py 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/dns/drivers/rackspace.py 2016-01-15 16:22:04.000000000 +0100 @@ -667,9 +667,10 @@ def _check_ptr_extra_fields(device_or_record): - if not (getattr(device_or_record, 'extra') and + if not (hasattr(device_or_record, 'extra') and + isinstance(device_or_record.extra, dict) and device_or_record.extra.get('uri') is not None and device_or_record.extra.get('service_name') is not None): raise LibcloudError("Can't create PTR Record for %s because it " "doesn't have a 'uri' and 'service_name' in " - "'extra'") + "'extra'" % device_or_record) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-libcloud-0.20.0/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml new/apache-libcloud-0.20.1/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml --- old/apache-libcloud-0.20.0/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml 2015-12-09 11:58:20.000000000 +0100 +++ new/apache-libcloud-0.20.1/libcloud/test/compute/fixtures/dimensiondata/caas_2_1_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml 2016-01-15 16:22:24.000000000 +0100 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<response requestId="na/2014-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types"> -<operation>ADD_PUBLIC_IP_BLOCK</operation> -<responseCode>OK</responseCode> -<message>Public IPv4 Address Block has been added successfully to Network Domain.</message> -<info name="publicIpBlockId" value="4487241a-f0ca-11e3-9315-d4bed9b167ba"/> +<?xml version="1.0" encoding="UTF-8"?> +<response xmlns="urn:didata.com:api:cloud:types" requestId="na/2015-12-20T16:59:48.842-05:00/28d362bb-249c-42b6-9236-ddd8729f332c"> + <operation>ADD_PUBLIC_IP_BLOCK</operation> + <responseCode>OK</responseCode> + <message>Public IPv4 Address Block has been added successfully to Network Domain d3320077-c2ce-4523-8c65-d417e766077b.</message> + <info name="ipBlockId" value="4487241a-f0ca-11e3-9315-d4bed9b167ba"/> </response> \ No newline at end of file

1 0

commit python-psutil for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package python-psutil for openSUSE:Factory checked in at 2016-01-26 10:14:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psutil (Old) and /work/SRC/openSUSE:Factory/.python-psutil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-psutil" Changes: -------- --- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes 2015-12-01 09:19:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-psutil.new/python-psutil.changes 2016-01-26 10:14:49.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Jan 21 09:01:36 UTC 2016 - michael(a)stroeder.com + +- update to version 3.4.2 (fixes for non-Linux platforms) + +------------------------------------------------------------------- +Fri Jan 15 19:39:31 UTC 2016 - michael(a)stroeder.com + +- update to version 3.4.1 + +**Enhancements** + +- #557: [NetBSD] added NetBSD support. (contributed by Ryo Onodera and + Thomas Klausner) +- #708: [Linux] psutil.net_connections() and Process.connections() on Python 2 + can be up to 3x faster in case of many connections. + Also psutil.Process.memory_maps() is slightly faster. +- #718: process_iter() is now thread safe. + +**Bug fixes** + +- #714: [OpenBSD] virtual_memory().cached value was always set to 0. +- #715: don't crash at import time if cpu_times() fail for some reason. +- #717: [Linux] Process.open_files fails if deleted files still visible. +- #722: [Linux] swap_memory() no longer crashes if sin/sout can't be determined + due to missing /proc/vmstat. +- #724: [FreeBSD] virtual_memory().total is slightly incorrect. + +------------------------------------------------------------------- Old: ---- psutil-3.3.0.tar.gz New: ---- psutil-3.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psutil.spec ++++++ --- /var/tmp/diff_new_pack.z6flGi/_old 2016-01-26 10:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.z6flGi/_new 2016-01-26 10:14:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-psutil -Version: 3.3.0 +Version: 3.4.2 Release: 0 Summary: A process utilities module for Python License: BSD-3-Clause ++++++ psutil-3.3.0.tar.gz -> psutil-3.4.2.tar.gz ++++++ ++++ 5426 lines of diff (skipped)

1 0

commit salt for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2016-01-26 10:14:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2015-12-23 08:49:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2016-01-26 10:14:45.000000000 +0100 @@ -1,0 +2,26 @@ +Fri Jan 15 13:16:46 UTC 2016 - dmacvicar(a)suse.de + +- Fix zypper module info_available on SLE-11 + * add salt-2015.8-zypper-info.patch + * https://github.com/saltstack/salt/pull/30384 +- zypper/pkg: add package attributes filtering + * add salt-2015.8-pkg-zypper-attr-filtering.patch + * https://github.com/saltstack/salt/pull/30267 +- Remove obsoleted patches and fixes: + * 0001-Add-rpm.minimal_info-fix-rpm.info.patch + * 0002-Reduce-information-returned-from-pkg.info_installed.patch + * Remove require on glibc-locale (bsc#959572) + +------------------------------------------------------------------- +Wed Jan 13 12:03:06 UTC 2016 - dmacvicar(a)suse.de + +- Add missing return data to scheduled jobs + * add salt-2015.8-schedule-ret.patch for + * https://github.com/saltstack/salt/pull/30246 + +------------------------------------------------------------------- +Mon Dec 21 14:06:27 UTC 2015 - kkaempf(a)suse.com + +- Update zypper-utf-8.patch for Python 2.6 + +------------------------------------------------------------------- Old: ---- 0001-Add-rpm.minimal_info-fix-rpm.info.patch 0002-Reduce-information-returned-from-pkg.info_installed.patch New: ---- salt-2015.8-pkg-zypper-attr-filtering.patch salt-2015.8-schedule-ret.patch salt-2015.8-zypper-info.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.Bpkufl/_old 2016-01-26 10:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Bpkufl/_new 2016-01-26 10:14:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package salt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,11 +53,12 @@ Patch3: 1efe484309a5c776974e723f3da0f5181f4bdb86.patch # PATCH-FIX-OPENSUSE detect bad UTF-8 in package header, bsc#958350 Patch4: zypper-utf-8.patch -# PATCH-FIX-OPENSUSE report epoch and architecture -Patch5: 0001-Add-rpm.minimal_info-fix-rpm.info.patch -# PATCH-FIX-OPENSUSE use minimal_info for pkg.info_installed -Patch6: 0002-Reduce-information-returned-from-pkg.info_installed.patch - +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30246 +Patch5: salt-2015.8-schedule-ret.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30267 +Patch6: salt-2015.8-pkg-zypper-attr-filtering.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/30384 +Patch7: salt-2015.8-zypper-info.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: logrotate BuildRequires: python @@ -105,8 +106,6 @@ %if 0%{?suse_version} Requires(pre): %fillup_prereq Requires(pre): pwdutils -# bsc#959572 -Requires: glibc-locale %endif Requires: logrotate Requires: python @@ -405,6 +404,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build python setup.py --salt-transport=both build ++++++ salt-2015.8-pkg-zypper-attr-filtering.patch ++++++ diff --git a/salt/modules/rpm.py b/salt/modules/rpm.py index 7810e22..51c72c9 100644 --- a/salt/modules/rpm.py +++ b/salt/modules/rpm.py @@ -8,7 +8,6 @@ from __future__ import absolute_import import logging import os import re -import time import datetime # Import Salt libs @@ -399,24 +398,20 @@ def diff(package, path): return res -def _pkg_time_to_iso(pkg_time): - ''' - Convert package time to ISO 8601. - - :param pkg_time: - :return: - ''' - ptime = time.strptime(pkg_time, '%a %d %b %Y %H:%M:%S %p %Z') - return datetime.datetime(ptime.tm_year, ptime.tm_mon, ptime.tm_mday, - ptime.tm_hour, ptime.tm_min, ptime.tm_sec).isoformat() + "Z" - - -def info(*packages): +def info(*packages, **attr): ''' Return a detailed package(s) summary information. If no packages specified, all packages will be returned. :param packages: + + :param attr: + Comma-separated package attributes. If no 'attr' is specified, all available attributes returned. + + Valid attributes are: + version, vendor, release, build_date, build_date_time_t, install_date, install_date_time_t, + build_host, group, source_rpm, arch, epoch, size, license, signature, packager, url, summary, description. + :return: CLI example: @@ -424,30 +419,59 @@ def info(*packages): .. code-block:: bash salt '*' lowpkg.info apache2 bash + salt '*' lowpkg.info apache2 bash attr=version + salt '*' lowpkg.info apache2 bash attr=version,build_date_iso,size ''' cmd = packages and "rpm -q {0}".format(' '.join(packages)) or "rpm -qa" - # Locale needs to be en_US instead of C, because RPM otherwise will yank the timezone from the timestamps - call = __salt__['cmd.run_all'](cmd + (" --queryformat 'Name: %{NAME}\n" - "Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n" - "Version: %{VERSION}\n" - "Vendor: %{VENDOR}\n" - "Release: %{RELEASE}\n" - "Build Date: %{BUILDTIME:date}\n" - "Install Date: %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n" - "Build Host: %{BUILDHOST}\n" - "Group: %{GROUP}\n" - "Source RPM: %{SOURCERPM}\n" - "Size: %{LONGSIZE}\n" - "%|LICENSE?{License: %{LICENSE}\n}|" - "Signature: %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n" - "%|PACKAGER?{Packager: %{PACKAGER}\n}|" - "%|URL?{URL: %{URL}\n}|" - "Summary: %{SUMMARY}\n" - "Description:\n%{DESCRIPTION}\n" - "-----\n'"), - output_loglevel='trace', env={'LC_ALL': 'en_US', 'TZ': 'UTC'}, clean_env=True) + # Construct query format + attr_map = { + "name": "name: %{NAME}\\n", + "relocations": "relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\\n", + "version": "version: %{VERSION}\\n", + "vendor": "vendor: %{VENDOR}\\n", + "release": "release: %{RELEASE}\\n", + "epoch": "%|EPOCH?{epoch: %{EPOCH}\\n}|", + "build_date_time_t": "build_date_time_t: %{BUILDTIME}\\n", + "build_date": "build_date: %{BUILDTIME}\\n", + "install_date_time_t": "install_date_time_t: %|INSTALLTIME?{%{INSTALLTIME}}:{(not installed)}|\\n", + "install_date": "install_date: %|INSTALLTIME?{%{INSTALLTIME}}:{(not installed)}|\\n", + "build_host": "build_host: %{BUILDHOST}\\n", + "group": "group: %{GROUP}\\n", + "source_rpm": "source_rpm: %{SOURCERPM}\\n", + "size": "size: %{LONGSIZE}\\n", + "arch": "arch: %{ARCH}\\n", + "license": "%|LICENSE?{license: %{LICENSE}\\n}|", + "signature": "signature: %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:" + "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\\n", + "packager": "%|PACKAGER?{packager: %{PACKAGER}\\n}|", + "url": "%|URL?{url: %{URL}\\n}|", + "summary": "summary: %{SUMMARY}\\n", + "description": "description:\\n%{DESCRIPTION}\\n", + } + + attr = attr.get('attr', None) and attr['attr'].split(",") or None + query = list() + if attr: + for attr_k in attr: + if attr_k in attr_map and attr_k != 'description': + query.append(attr_map[attr_k]) + if not query: + raise CommandExecutionError('No valid attributes found.') + if 'name' not in attr: + attr.append('name') + query.append(attr_map['name']) + else: + for attr_k, attr_v in attr_map.iteritems(): + if attr_k != 'description': + query.append(attr_v) + if attr and 'description' in attr or not attr: + query.append(attr_map['description']) + query.append("-----\\n") + + call = __salt__['cmd.run_all'](cmd + (" --queryformat '{0}'".format(''.join(query))), + output_loglevel='trace', env={'TZ': 'UTC'}, clean_env=True) if call['retcode'] != 0: comment = '' if 'stderr' in call: @@ -477,17 +501,31 @@ def info(*packages): if len(line) != 2: continue key, value = line - key = key.replace(' ', '_').lower() if key == 'description': descr_marker = True continue if key == 'name': pkg_name = value + + # Convert Unix ticks into ISO time format if key in ['build_date', 'install_date']: - value = _pkg_time_to_iso(value) - if key != 'description' and value: + try: + pkg_data[key] = datetime.datetime.fromtimestamp(int(value)).isoformat() + "Z" + except ValueError: + log.warning('Could not convert "{0}" into Unix time'.format(value)) + continue + + # Convert Unix ticks into an Integer + if key in ['build_date_time_t', 'install_date_time_t']: + try: + pkg_data[key] = int(value) + except ValueError: + log.warning('Could not convert "{0}" into Unix time'.format(value)) + continue + if key not in ['description', 'name'] and value: pkg_data[key] = value - pkg_data['description'] = os.linesep.join(descr) + if attr and 'description' in attr or not attr: + pkg_data['description'] = os.linesep.join(descr) if pkg_name: ret[pkg_name] = pkg_data diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 84b5d51..ccba713 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -96,19 +96,32 @@ def list_upgrades(refresh=True): list_updates = salt.utils.alias_function(list_upgrades, 'list_updates') -def info_installed(*names): +def info_installed(*names, **attr): ''' Return the information of the named package(s), installed on the system. + :param names: + Names of the packages to get information about. + + :param attr: + Comma-separated package attributes. If no 'attr' is specified, all available attributes returned. + + Valid attributes are: + version, vendor, release, build_date, build_date_time_t, install_date, install_date_time_t, + build_host, group, source_rpm, arch, epoch, size, license, signature, packager, url, + summary, description. + CLI example: .. code-block:: bash salt '*' pkg.info_installed <package1> salt '*' pkg.info_installed <package1> <package2> <package3> ... + salt '*' pkg.info_installed <package1> attr=version,vendor + salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor ''' ret = dict() - for pkg_name, pkg_nfo in __salt__['lowpkg.info'](*names).items(): + for pkg_name, pkg_nfo in __salt__['lowpkg.info'](*names, **attr).items(): t_nfo = dict() # Translate dpkg-specific keys to a common structure for key, value in pkg_nfo.items(): ++++++ salt-2015.8-schedule-ret.patch ++++++ diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py index 4458202..cae5fcf 100644 --- a/salt/utils/schedule.py +++ b/salt/utils/schedule.py @@ -482,24 +482,24 @@ class Schedule(object): func = None if func not in self.functions: log.info( - 'Invalid function: {0} in job {1}. Ignoring.'.format( + 'Invalid function: {0} in scheduled job {1}.'.format( func, name ) ) + + if 'name' not in data: + data['name'] = name + log.info( + 'Running Job: {0}.'.format(name) + ) + if self.opts.get('multiprocessing', True): + thread_cls = multiprocessing.Process else: - if 'name' not in data: - data['name'] = name - log.info( - 'Running Job: {0}.'.format(name) - ) - if self.opts.get('multiprocessing', True): - thread_cls = multiprocessing.Process - else: - thread_cls = threading.Thread - proc = thread_cls(target=self.handle_func, args=(func, data)) - proc.start() - if self.opts.get('multiprocessing', True): - proc.join() + thread_cls = threading.Thread + proc = thread_cls(target=self.handle_func, args=(func, data)) + proc.start() + if self.opts.get('multiprocessing', True): + proc.join() def enable_schedule(self): ''' @@ -642,33 +642,39 @@ class Schedule(object): except OSError: log.info('Unable to remove file: {0}.'.format(fn_)) - salt.utils.daemonize_if(self.opts) + try: + salt.utils.daemonize_if(self.opts) - ret['pid'] = os.getpid() + ret['pid'] = os.getpid() - if 'jid_include' not in data or data['jid_include']: - log.debug('schedule.handle_func: adding this job to the jobcache ' - 'with data {0}'.format(ret)) - # write this to /var/cache/salt/minion/proc - with salt.utils.fopen(proc_fn, 'w+b') as fp_: - fp_.write(salt.payload.Serial(self.opts).dumps(ret)) - - args = tuple() - if 'args' in data: - args = data['args'] - - kwargs = {} - if 'kwargs' in data: - kwargs = data['kwargs'] - # if the func support **kwargs, lets pack in the pub data we have - # TODO: pack the *same* pub data as a minion? - argspec = salt.utils.args.get_function_argspec(self.functions[func]) - if argspec.keywords: - # this function accepts **kwargs, pack in the publish data - for key, val in six.iteritems(ret): - kwargs['__pub_{0}'.format(key)] = val + if 'jid_include' not in data or data['jid_include']: + log.debug('schedule.handle_func: adding this job to the jobcache ' + 'with data {0}'.format(ret)) + # write this to /var/cache/salt/minion/proc + with salt.utils.fopen(proc_fn, 'w+b') as fp_: + fp_.write(salt.payload.Serial(self.opts).dumps(ret)) + + args = tuple() + if 'args' in data: + args = data['args'] + + kwargs = {} + if 'kwargs' in data: + kwargs = data['kwargs'] + + if func not in self.functions: + ret['return'] = self.functions.missing_fun_string(func) + salt.utils.error.raise_error( + message=self.functions.missing_fun_string(func)) + + # if the func support **kwargs, lets pack in the pub data we have + # TODO: pack the *same* pub data as a minion? + argspec = salt.utils.args.get_function_argspec(self.functions[func]) + if argspec.keywords: + # this function accepts **kwargs, pack in the publish data + for key, val in six.iteritems(ret): + kwargs['__pub_{0}'.format(key)] = val - try: ret['return'] = self.functions[func](*args, **kwargs) data_returner = data.get('returner', None) @@ -694,28 +700,34 @@ class Schedule(object): ) ) - # Only attempt to return data to the master - # if the scheduled job is running on a minion. - if '__role' in self.opts and self.opts['__role'] == 'minion': - if 'return_job' in data and not data['return_job']: - pass - else: - # Send back to master so the job is included in the job list - mret = ret.copy() - mret['jid'] = 'req' - channel = salt.transport.Channel.factory(self.opts, usage='salt_schedule') - load = {'cmd': '_return', 'id': self.opts['id']} - for key, value in six.iteritems(mret): - load[key] = value - channel.send(load) - + ret['retcode'] = self.functions.pack['__context__']['retcode'] + ret['success'] = True except Exception: log.exception("Unhandled exception running {0}".format(ret['fun'])) # Although catch-all exception handlers are bad, the exception here # is to let the exception bubble up to the top of the thread context, # where the thread will die silently, which is worse. + if 'return' not in ret: + ret['return'] = "Unhandled exception running {0}".format(ret['fun']) + ret['success'] = False + ret['retcode'] = 254 finally: try: + # Only attempt to return data to the master + # if the scheduled job is running on a minion. + if '__role' in self.opts and self.opts['__role'] == 'minion': + if 'return_job' in data and not data['return_job']: + pass + else: + # Send back to master so the job is included in the job list + mret = ret.copy() + mret['jid'] = 'req' + channel = salt.transport.Channel.factory(self.opts, usage='salt_schedule') + load = {'cmd': '_return', 'id': self.opts['id']} + for key, value in six.iteritems(mret): + load[key] = value + channel.send(load) + log.debug('schedule.handle_func: Removing {0}'.format(proc_fn)) os.unlink(proc_fn) except OSError as exc: @@ -757,11 +769,10 @@ class Schedule(object): func = None if func not in self.functions: log.info( - 'Invalid function: {0} in job {1}. Ignoring.'.format( + 'Invalid function: {0} in scheduled job {1}.'.format( func, job ) ) - continue if 'name' not in data: data['name'] = job # Add up how many seconds between now and then ++++++ salt-2015.8-zypper-info.patch ++++++ diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index ccba713..9d654a2 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -164,12 +164,14 @@ def info_available(*names, **kwargs): # Run in batches while batch: cmd = 'zypper info -t package {0}'.format(' '.join(batch[:batch_size])) - pkg_info.extend(re.split(r"----*", __salt__['cmd.run_stdout'](cmd, output_loglevel='trace'))) + pkg_info.extend(re.split(r"Information for package*", __salt__['cmd.run_stdout'](cmd, output_loglevel='trace'))) batch = batch[batch_size:] for pkg_data in pkg_info: nfo = {} for line in [data for data in pkg_data.split("\n") if ":" in data]: + if line.startswith("-----"): + continue kw = [data.strip() for data in line.split(":", 1)] if len(kw) == 2 and kw[1]: nfo[kw[0].lower()] = kw[1] ++++++ zypper-utf-8.patch ++++++ --- /var/tmp/diff_new_pack.Bpkufl/_old 2016-01-26 10:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Bpkufl/_new 2016-01-26 10:14:46.000000000 +0100 @@ -1,15 +1,40 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-salt-2015.8.3/salt/modules/zypper.py ./salt/modules/zypper.py ---- ../orig-salt-2015.8.3/salt/modules/zypper.py 2015-12-01 22:25:13.000000000 +0100 -+++ ./salt/modules/zypper.py 2015-12-09 09:15:41.157266587 +0100 -@@ -112,6 +112,11 @@ +From 8fcc530f0473e9fcd5a7099617516a6d184b5303 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Thu, 10 Dec 2015 13:21:41 +0100 +Subject: [PATCH] zypper: check package header content for valid utf-8 + +"salt 'system.domain.tld' pkg.info_installed --out json" can crash with + + [ERROR ] An un-handled exception was caught by salt's global exception handler: + UnicodeDecodeError: 'utf8' codec can't decode byte ... + +if a package name, summary, or description contains invalid UTF-8. + +This patch detects such rpm header values, logs them as errors, and +replaces them with "*** Bad UTF-8 ***". + +Update: drop the 'errors=' named parameter from the encode() call as it +is incompatible with Python 2.6 as used in SLE 11. +--- + salt/modules/zypper.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py +index be28311ae1bd..483d63e08edc 100644 +--- a/salt/modules/zypper.py ++++ b/salt/modules/zypper.py +@@ -115,6 +115,11 @@ def info_installed(*names): t_nfo = dict() # Translate dpkg-specific keys to a common structure for key, value in pkg_nfo.items(): + try: -+ value = value.encode('UTF-8', errors='replace') ++ value = value.encode('UTF-8', 'replace') + except(UnicodeDecodeError): -+ log.error('Package ' + pkg_name + ' has bad UTF-8 code in ' + key + ': ' + value) ++ log.error('Package {0} has bad UTF-8 code in {1}: {2}'.format(pkg_name, key, value)) + value = '*** Bad UTF-8 ***' if key == 'source_rpm': t_nfo['source'] = value else: +-- +2.6.3 +

1 0

commit python-celery for openSUSE:Factory
by root＠hilbert.suse.de 26 Jan '16

26 Jan '16

Hello community, here is the log from the commit of package python-celery for openSUSE:Factory checked in at 2016-01-26 10:14:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-celery (Old) and /work/SRC/openSUSE:Factory/.python-celery.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-celery" Changes: -------- --- /work/SRC/openSUSE:Factory/python-celery/python-celery.changes 2015-05-06 07:48:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-celery.new/python-celery.changes 2016-01-26 10:14:44.000000000 +0100 @@ -1,0 +2,32 @@ +Wed Jan 13 17:43:19 UTC 2016 - antoine.belvire(a)laposte.net + +- Update to 3.1.19: + * Requirements: Now depends on Kombu 3.0.29. + * Requirements: Now depends on billiard 3.3.0.21. + * Results: Fixed MongoDB result backend URL parsing problem + (Issue celery/kombu#375). + * Worker: Task request now properly sets priority in + delivery_info. + * Beat: PyPy shelve may raise KeyError when setting keys (Issue + #2862). + * Programs: celery beat --deatched now working on PyPy. + * Results: Redis result backend now ensures all pipelines are + cleaned up. + * Results: Redis result backend now allows for timeout to be set + in the query portion of the result backend URL. + * Results: result.get now properly handles failures where the + exception value is set to None (Issue #2560). + * Prefork pool: Fixed attribute error proc.dead. + * Worker: Fixed worker hanging when gossip/heartbeat disabled + (Issue #1847). + * Results: MongoDB result backend now supports pymongo 3.x (Issue + #2744). + * Results: RPC/amqp backends did not deserialize exceptions + properly (Issue #2691). + * Programs: Fixed problem with celery amqp‘s basic_publish (Issue + #2013). + * Worker: Embedded beat now properly sets app for thread/process + (Issue #2594). + * Documentation: Many improvements and typos fixed. + +------------------------------------------------------------------- Old: ---- celery-3.1.18.tar.gz New: ---- celery-3.1.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-celery.spec ++++++ --- /var/tmp/diff_new_pack.Ev72t0/_old 2016-01-26 10:14:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Ev72t0/_new 2016-01-26 10:14:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-celery # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-celery -Version: 3.1.18 +Version: 3.1.19 Release: 0 Url: http://celeryproject.org Summary: Distributed Task Queue @@ -26,14 +26,14 @@ Source: https://pypi.python.org/packages/source/c/celery/celery-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-SQLAlchemy -BuildRequires: python-billiard +BuildRequires: python-billiard >= 3.3.0.21 BuildRequires: python-cl BuildRequires: python-curses BuildRequires: python-dateutil BuildRequires: python-devel BuildRequires: python-eventlet BuildRequires: python-gevent -BuildRequires: python-kombu >= 3.0.25 +BuildRequires: python-kombu >= 3.0.29 BuildRequires: python-mock BuildRequires: python-nose-cover3 BuildRequires: python-pyOpenSSL ++++++ celery-3.1.18.tar.gz -> celery-3.1.19.tar.gz ++++++ ++++ 2542 lines of diff (skipped)

1 0