openSUSE Commits
Threads by month
- ----- 2024 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2019
- 2 participants
- 2045 discussions
Hello community,
here is the log from the commit of package neovim for openSUSE:Factory checked in at 2019-07-08 15:12:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/neovim (Old)
and /work/SRC/openSUSE:Factory/.neovim.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neovim"
Mon Jul 8 15:12:49 2019 rev:24 rq:714013 version:0.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2019-06-12 13:32:01.340183641 +0200
+++ /work/SRC/openSUSE:Factory/.neovim.new.4615/neovim.changes 2019-07-08 16:33:13.324284727 +0200
@@ -1,0 +2,8 @@
+Mon Jul 8 08:31:03 UTC 2019 - Martin Liška <mliska(a)suse.cz>
+
+- Update to version 0.3.8:
+
+ * 5b47e4d #10341 security: 'modeline', 'modelineexpr'
+ * e4ecb70 #10345 Disallow API calls in the sandbox.
+
+-------------------------------------------------------------------
Old:
----
neovim-0.3.7.tar.gz
New:
----
neovim-0.3.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ neovim.spec ++++++
--- /var/tmp/diff_new_pack.WgaHAG/_old 2019-07-08 16:33:14.176285973 +0200
+++ /var/tmp/diff_new_pack.WgaHAG/_new 2019-07-08 16:33:14.180285978 +0200
@@ -17,7 +17,7 @@
Name: neovim
-Version: 0.3.7
+Version: 0.3.8
Release: 0
Summary: Vim-fork focused on extensibility and agility
License: Apache-2.0 AND Vim
++++++ neovim-0.3.7.tar.gz -> neovim-0.3.8.tar.gz ++++++
/work/SRC/openSUSE:Factory/neovim/neovim-0.3.7.tar.gz /work/SRC/openSUSE:Factory/.neovim.new.4615/neovim-0.3.8.tar.gz differ: char 29, line 1
1
0
Hello community,
here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2019-07-08 15:12:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lollypop (Old)
and /work/SRC/openSUSE:Factory/.lollypop.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Mon Jul 8 15:12:03 2019 rev:87 rq:713867 version:1.1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-06-30 10:21:19.935604436 +0200
+++ /work/SRC/openSUSE:Factory/.lollypop.new.4615/lollypop.changes 2019-07-08 16:32:19.284208928 +0200
@@ -1,0 +2,11 @@
+Sun Jul 07 16:18:22 UTC 2019 - antoine.belvire(a)opensuse.org
+
+- Update to version 1.1.4.1:
+ * Fix a crash (glgo#World/lollypop#1884).
+- Changes from version 1.1.4:
+ * Fix some crashes (glgo#World/lollypop#1878,
+ glgo#World/lollypop#1880).
+ * Fix a shortcut issue (glgo#World/lollypop#1879).
+ * Fix display of compilations (glgo#World/lollypop#1875).
+
+-------------------------------------------------------------------
Old:
----
lollypop-1.1.3.1.tar.xz
New:
----
lollypop-1.1.4.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.Vkyuwe/_old 2019-07-08 16:32:19.832209693 +0200
+++ /var/tmp/diff_new_pack.Vkyuwe/_new 2019-07-08 16:32:19.832209693 +0200
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 1.1.3.1
+Version: 1.1.4.1
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Vkyuwe/_old 2019-07-08 16:32:19.892209776 +0200
+++ /var/tmp/diff_new_pack.Vkyuwe/_new 2019-07-08 16:32:19.896209782 +0200
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">1.1.3.1</param>
+ <param name="revision">1.1.4.1</param>
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/World/lollypop.git</param>
<param name="versionformat">@PARENT_TAG@</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Vkyuwe/_old 2019-07-08 16:32:19.920209815 +0200
+++ /var/tmp/diff_new_pack.Vkyuwe/_new 2019-07-08 16:32:19.920209815 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param name="changesrevision">a152d1c05406df1c1a129fff547401c4837ccb9c</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">f060b2efe73af742d04ccccf50139163b2a493b5</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-1.1.3.1.tar.xz -> lollypop-1.1.4.1.tar.xz ++++++
++++ 4351 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libreplaygain for openSUSE:Factory checked in at 2019-07-08 15:12:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreplaygain (Old)
and /work/SRC/openSUSE:Factory/.libreplaygain.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreplaygain"
Mon Jul 8 15:12:07 2019 rev:2 rq:713874 version:r475
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreplaygain/libreplaygain.changes 2019-07-04 15:44:31.674226887 +0200
+++ /work/SRC/openSUSE:Factory/.libreplaygain.new.4615/libreplaygain.changes 2019-07-08 16:31:47.312164335 +0200
@@ -1,0 +2,5 @@
+Sun Jul 7 00:41:38 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Make descriptions more meaningful.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreplaygain.spec ++++++
--- /var/tmp/diff_new_pack.ee3Wqm/_old 2019-07-08 16:31:47.756164955 +0200
+++ /var/tmp/diff_new_pack.ee3Wqm/_new 2019-07-08 16:31:47.756164955 +0200
@@ -1,8 +1,8 @@
#
# spec file for package libreplaygain
#
-# Copyright (c) 2013 Asterios Dramis <asterios.dramis(a)gmail.com>.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 Asterios Dramis <asterios.dramis(a)gmail.com>.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,19 +20,19 @@
%define so_ver 1
Name: libreplaygain
+Summary: Library for analyzing sound and recommending volume change
+License: LGPL-2.1-or-later
+Group: Development/Libraries/C and C++
Version: r475
Release: 0
-License: LGPL-2.1-or-later
-Summary: Analyze Input Samples and Give the Recommended dB Change
-Url: https://www.musepack.net/
-Group: System/Libraries
+URL: https://www.musepack.net/
Source0: https://files.musepack.net/source/%{name}_%{version}.tar.gz
Patch0: libreplaygain-math.patch
BuildRequires: cmake
%description
-libreplaygain is a library that analyzes input samples and give the recommended
-dB change.
+libreplaygain is a library that analyzes input samples and gives the
+recommended volume change.
%package devel
Summary: Development files for libreplaygain
@@ -43,12 +43,12 @@
This package includes development files for libreplaygain.
%package -n libreplaygain%{so_ver}
-Summary: Analyze Input Samples and Give the Recommended dB Change
+Summary: Library for analyzing sound and recommending volume change
Group: System/Libraries
%description -n libreplaygain%{so_ver}
-libreplaygain is a library that analyzes input samples and give the recommended
-dB change.
+libreplaygain is a library that analyzes input samples and gives the
+recommended volume change.
%prep
%setup -q -n %{name}_%{version}
1
0
Hello community,
here is the log from the commit of package libcuefile for openSUSE:Factory checked in at 2019-07-08 15:12:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcuefile (Old)
and /work/SRC/openSUSE:Factory/.libcuefile.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcuefile"
Mon Jul 8 15:12:05 2019 rev:2 rq:713873 version:r475
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcuefile/libcuefile.changes 2019-07-04 15:44:27.650220608 +0200
+++ /work/SRC/openSUSE:Factory/.libcuefile.new.4615/libcuefile.changes 2019-07-08 16:30:59.108097104 +0200
@@ -1,0 +2,5 @@
+Sun Jul 7 00:39:42 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update SRPM group.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcuefile.spec ++++++
--- /var/tmp/diff_new_pack.xUnctX/_old 2019-07-08 16:30:59.600097790 +0200
+++ /var/tmp/diff_new_pack.xUnctX/_new 2019-07-08 16:30:59.600097790 +0200
@@ -1,8 +1,8 @@
#
# spec file for package libcuefile
#
-# Copyright (c) 2013 Asterios Dramis <asterios.dramis(a)gmail.com>.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 Asterios Dramis <asterios.dramis(a)gmail.com>.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,11 @@
Name: libcuefile
Version: r475
-Release: 1
-License: GPL-2.0-only
+Release: 0
Summary: Library for Working With Cue Sheet (cue) and Table Of Contents (toc) Files
+License: GPL-2.0-only
+Group: Development/Libraries/C and C++
Url: https://www.musepack.net/
-Group: System/Libraries
Source0: https://files.musepack.net/source/%{name}_%{version}.tar.gz
# PATCH-FIX-OPENSUSE mathmeaning.patch asterios.dramis(a)gmail.com -- Fix rpm post build error "Program uses operation a <= b <= c, which is not well defined." (based on patch from openSUSE cuetools)
Patch0: mathmeaning.patch
1
0
Hello community,
here is the log from the commit of package jsch-agent-proxy for openSUSE:Factory checked in at 2019-07-08 15:12:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jsch-agent-proxy (Old)
and /work/SRC/openSUSE:Factory/.jsch-agent-proxy.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jsch-agent-proxy"
Mon Jul 8 15:12:16 2019 rev:2 rq:713946 version:0.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/jsch-agent-proxy/jsch-agent-proxy.changes 2019-07-02 10:38:32.898595735 +0200
+++ /work/SRC/openSUSE:Factory/.jsch-agent-proxy.new.4615/jsch-agent-proxy.changes 2019-07-08 16:29:52.772004583 +0200
@@ -1,0 +2,5 @@
+Sun Jul 7 22:05:12 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Trim bias and conjecture from descriptions.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jsch-agent-proxy.spec ++++++
--- /var/tmp/diff_new_pack.KLuHgT/_old 2019-07-08 16:29:53.320005348 +0200
+++ /var/tmp/diff_new_pack.KLuHgT/_new 2019-07-08 16:29:53.320005348 +0200
@@ -36,11 +36,10 @@
%description
jsch-agent-proxy is a proxy program to OpenSSH ssh-agent and Pageant
-included Putty. It will be easily integrated into JSch, and users
-will be allowed to use those programs in authentications. This
-software has been developed for JSch, but it will be easily applicable
-to other ssh2 implementations in Java. This software is licensed
-under BSD style license.
+included Putty. It can be integrated into JSch, and users
+can be allowed to use those programs in authentications. This
+software has been developed for JSch, but it can be applicable
+to other SSH2 implementations in Java.
%package connector-factory
Summary: Connector factory for jsch-agent-proxy
1
0
Hello community,
here is the log from the commit of package jgmenu for openSUSE:Factory checked in at 2019-07-08 15:12:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jgmenu (Old)
and /work/SRC/openSUSE:Factory/.jgmenu.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgmenu"
Mon Jul 8 15:12:20 2019 rev:6 rq:713950 version:3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/jgmenu/jgmenu.changes 2019-05-22 15:41:34.714427178 +0200
+++ /work/SRC/openSUSE:Factory/.jgmenu.new.4615/jgmenu.changes 2019-07-08 16:29:47.271996913 +0200
@@ -1,0 +2,11 @@
+Mon Jul 8 06:32:33 UTC 2019 - mvetter(a)suse.com
+
+- Update to 3.1:
+ * In obtheme module, support openbox config file (rc.xml) user override
+ by setting environment variable JGMENU_RCXML. For example:
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu_run obtheme jgmenurc
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu init --apply-obtheme
+ * Minor updates to man pages
+ * Fix incorrect relative path in unit test t1201-lx.t
+
+-------------------------------------------------------------------
Old:
----
v3.0.tar.gz
New:
----
v3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jgmenu.spec ++++++
--- /var/tmp/diff_new_pack.Pmo215/_old 2019-07-08 16:29:48.443998547 +0200
+++ /var/tmp/diff_new_pack.Pmo215/_new 2019-07-08 16:29:48.451998558 +0200
@@ -17,7 +17,7 @@
Name: jgmenu
-Version: 3.0
+Version: 3.1
Release: 0
Summary: Small X11 menu intended to be used with openbox and tint2
License: GPL-2.0-only
++++++ v3.0.tar.gz -> v3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/NEWS.md new/jgmenu-3.1/NEWS.md
--- old/jgmenu-3.0/NEWS.md 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/NEWS.md 2019-07-06 11:21:00.000000000 +0200
@@ -6,6 +6,7 @@
## Recent releases
+[v3.1](docs/relnotes/3.1.txt)
[v3.0](docs/relnotes/3.0.txt)
[v2.2.1](docs/relnotes/2.2.1.txt)
[v2.2](docs/relnotes/2.2.txt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/debian/changelog new/jgmenu-3.1/debian/changelog
--- old/jgmenu-3.0/debian/changelog 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/debian/changelog 2019-07-06 11:21:00.000000000 +0200
@@ -1,5 +1,5 @@
-jgmenu (3.0) UNRELEASED; urgency=medium
+jgmenu (3.1) UNRELEASED; urgency=medium
* New upstream release
- -- Johan Malm <jgm323(a)gmail.com> Sun, 19 May 2019 21:39:19 +0000
+ -- Johan Malm <jgm323(a)gmail.com> Sat, 06 Jul 2019 10:20:09 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/debian/control new/jgmenu-3.1/debian/control
--- old/jgmenu-3.0/debian/control 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/debian/control 2019-07-06 11:21:00.000000000 +0200
@@ -17,4 +17,7 @@
Package: jgmenu
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3
-Description: simple X11 menu intended to be used with tint2 and openbox
+Description: Simple X11 menu
+ A stand-alone, contemporary-looking menu application for Linux and BSD.
+ Independent of window manager and panel.
+ Designed for customisation, scripting, ricing and tweaking
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/docs/manual/jgmenu.1 new/jgmenu-3.1/docs/manual/jgmenu.1
--- old/jgmenu-3.0/docs/manual/jgmenu.1 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/docs/manual/jgmenu.1 2019-07-06 11:21:00.000000000 +0200
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.7.2
.\"
-.TH "JGMENU" "1" "18 May, 2019" "" ""
+.TH "JGMENU" "1" "18 June, 2019" "" ""
.hy
.SH NAME
.PP
@@ -31,13 +31,16 @@
.IP
.nf
\f[C]
-\[u250C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u252C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2510]
-\[br] jgmenu \[br] launch menu \[br]
-\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
-\[br] jgmenu init \[br] create config file \[br]
-\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
-\[br] man jgmenututorial \[br] read step-by-step guide \[br]
-\[u2514]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2534]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2518]
+\[u250C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u252C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2510]
+\[br] jgmenu_run \[br] Launch menu \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] jgmenu init \[br] Create config file \[br]
+\[br] \[br] \[ti]/.config/jgmenu/jgmenurc \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] jgmenu init -i \[br] Interactive setup \[br]
+\[u251C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u253C]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2524]
+\[br] man jgmenututorial \[br] Read step-by-step guide \[br]
+\[u2514]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2534]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2500]\[u2518]
\f[R]
.fi
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/docs/manual/jgmenu.1.md new/jgmenu-3.1/docs/manual/jgmenu.1.md
--- old/jgmenu-3.0/docs/manual/jgmenu.1.md 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/docs/manual/jgmenu.1.md 2019-07-06 11:21:00.000000000 +0200
@@ -1,6 +1,6 @@
% JGMENU(1)
% Johan Malm
-% 18 May, 2019
+% 18 June, 2019
# NAME
@@ -18,13 +18,16 @@
## Use these three commands to get started
- ┌────────────────────┬─────────────────────────┐
- │ jgmenu │ launch menu │
- ├────────────────────┼─────────────────────────┤
- │ jgmenu init │ create config file │
- ├────────────────────┼─────────────────────────┤
- │ man jgmenututorial │ read step-by-step guide │
- └────────────────────┴─────────────────────────┘
+ ┌────────────────────┬───────────────────────────┐
+ │ jgmenu_run │ Launch menu │
+ ├────────────────────┼───────────────────────────┤
+ │ jgmenu init │ Create config file │
+ │ │ ~/.config/jgmenu/jgmenurc │
+ ├────────────────────┼───────────────────────────┤
+ │ jgmenu init -i │ Interactive setup │
+ ├────────────────────┼───────────────────────────┤
+ │ man jgmenututorial │ Read step-by-step guide │
+ └────────────────────┴───────────────────────────┘
# DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/docs/relnotes/3.1.txt new/jgmenu-3.1/docs/relnotes/3.1.txt
--- old/jgmenu-3.0/docs/relnotes/3.1.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/jgmenu-3.1/docs/relnotes/3.1.txt 2019-07-06 11:21:00.000000000 +0200
@@ -0,0 +1,14 @@
+jgmenu v3.1 release notes
+=========================
+
+Updates since v3.0
+------------------
+
+ * In obtheme module, support openbox config file (rc.xml) user override
+ by setting environment variable JGMENU_RCXML. For example:
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu_run obtheme jgmenurc
+ JGMENU_RCXML=$HOME/.config/openbox/bl-rc.xml jgmenu init --apply-obtheme
+
+ * Minor updates to man pages
+
+ * Fix incorrect relative path in unit test t1201-lx.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/scripts/make-debian.sh new/jgmenu-3.1/scripts/make-debian.sh
--- old/jgmenu-3.0/scripts/make-debian.sh 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/scripts/make-debian.sh 2019-07-06 11:21:00.000000000 +0200
@@ -5,7 +5,7 @@
#
test -d "debian" || { echo "fatal: need to run from project root"; exit 1; }
-test -f "jgmenu.c" || { echo "fatal: need to run from project root"; exit 1; }
+test -f "src/jgmenu.c" || { echo "fatal: need to run from project root"; exit 1; }
ver=$(./scripts/version-gen.sh | sed -e 's/^jgmenu v//' | cut -f1 -d"-")
#git describe --exact-match HEAD 2>/dev/null || echo "warn: not at tag"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/scripts/version-gen.sh new/jgmenu-3.1/scripts/version-gen.sh
--- old/jgmenu-3.0/scripts/version-gen.sh 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/scripts/version-gen.sh 2019-07-06 11:21:00.000000000 +0200
@@ -8,7 +8,7 @@
# Change "default_version" before doing a `git tag -a ...`
#
-default_version="3.0"
+default_version="3.1"
v=$(git describe --dirty --abbrev=1 2>/dev/null)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/src/jgmenu-init.sh new/jgmenu-3.1/src/jgmenu-init.sh
--- old/jgmenu-3.0/src/jgmenu-init.sh 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/src/jgmenu-init.sh 2019-07-06 11:21:00.000000000 +0200
@@ -58,6 +58,7 @@
--theme=<theme> Create config file with a particular theme\n\
--list-themes Display all available themes\n\
--regression-check Only check for config options no longer valid\n\
+ --apply-obtheme Apply current openbox theme to menu\n\
--verbose Be more verbose\n"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/src/jgmenu-obtheme.c new/jgmenu-3.1/src/jgmenu-obtheme.c
--- old/jgmenu-3.0/src/jgmenu-obtheme.c 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/src/jgmenu-obtheme.c 2019-07-06 11:21:00.000000000 +0200
@@ -29,7 +29,14 @@
};
static const char obtheme_usage[] =
-"Usage: jgmenu_run obtheme <jgmenurc filename>\n";
+"Usage: jgmenu_run obtheme <jgmenurc filename>\n\n"
+"The theme name will be obtained from:\n"
+" * ~/.config/openbox/rc.xml\n"
+" * /etc/xdg/openbox/rc.xml\n"
+"Set environment variable JGMENU_RCXML to specify a different file\n\n"
+"Openbox theme files will be searched for in:\n"
+" * ~/.themes/\n"
+" * /usr/share/themes/\n";
void usage(void)
{
@@ -181,7 +188,7 @@
return -1;
}
-static int find_rcxml(struct sbuf *filename)
+static void find_rcxml(struct sbuf *filename)
{
struct stat sb;
int i;
@@ -190,22 +197,27 @@
sbuf_cpy(filename, rcxml_files[i]);
sbuf_expand_tilde(filename);
if (!stat(filename->buf, &sb))
- return 0;
+ return;
}
- return -1;
+ die("cannot find rc.xml");
}
int main(int argc, char **argv)
{
struct sbuf filename;
+ char *p;
if (argc != 2)
usage();
sbuf_init(&filename);
LIBXML_TEST_VERSION
- if (find_rcxml(&filename) < 0)
- die("cannot find rc.xml");
+ p = getenv("JGMENU_RCXML");
+ if (p)
+ sbuf_cpy(&filename, p);
+ else
+ find_rcxml(&filename);
+
get_obtheme_from_rcxml(filename.buf);
info("detected theme '%s' from file '%s'", obtheme, filename.buf);
if (find_themerc(&filename) < 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jgmenu-3.0/tests/t1201-lx.t new/jgmenu-3.1/tests/t1201-lx.t
--- old/jgmenu-3.0/tests/t1201-lx.t 2019-05-19 22:42:15.000000000 +0200
+++ new/jgmenu-3.1/tests/t1201-lx.t 2019-07-06 11:21:00.000000000 +0200
@@ -11,7 +11,8 @@
fi
generate_directories () {
- d="${PWD}/../t1201/desktop-directories"
+ d="${PWD}/t1201/desktop-directories"
+ printf "%b\n" ".directory files generated in: $d"
rm -rf "${d}"
mkdir -p "${d}"
for i in $(seq 9)
@@ -23,7 +24,8 @@
}
generate_apps () {
- d="${PWD}/../t1201/applications"
+ d="${PWD}/t1201/applications"
+ printf "%b\n" ".desktop files generated in: $d"
rm -rf "${d}"
mkdir -p "${d}"
for i in $(seq 9)
@@ -39,16 +41,25 @@
done
}
+generate_menu_file () {
+ d="${PWD}/t1201/menus"
+ rm -rf "${d}"
+ mkdir -p "${d}"
+ cp ../t1201/menus/test2-applications.menu "$d"
+}
+
test_menu () {
- d="${PWD}/../t1201"
+ d="${PWD}/t1201"
export XDG_CONFIG_DIRS="${d}"
export XDG_DATA_HOME="${d}"
+ printf "%b\n" "XDG_DATA_HOME=$XDG_DATA_HOME"
export XDG_MENU_PREFIX="${1}-"
rm -rf ~/.cache/menus &&
+ cp "../t1201/${1}.expect" expect &&
LANG=C LC_ALL=C ../../jgmenu-lx >actual &&
- cp "${d}/${1}.expect" expect &&
+ cp "../t1201/${1}.expect" expect &&
test_cmp expect actual
}
@@ -56,6 +67,7 @@
generate_directories &&
generate_apps &&
+generate_menu_file &&
test_menu "test2"
'
1
0
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2019-07-08 16:07:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Mon Jul 8 16:07:21 2019 rev:192 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.rfjDm5/_old 2019-07-08 16:24:21.003559517 +0200
+++ /var/tmp/diff_new_pack.rfjDm5/_new 2019-07-08 16:24:21.007559521 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20190705)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20190708)
#
# Copyright (c) 2019 openSUSE.
#
@@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon
-Version: 20190705
+Version: 20190708
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
-Provides: product(openSUSE-Addon-NonOss) = 20190705-0
+Provides: product(openSUSE-Addon-NonOss) = 20190708-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190705
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190708
AutoReqProv: on
@@ -49,10 +49,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20190705</version>
+ <version>20190708</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190705</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190708</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.rfjDm5/_old 2019-07-08 16:24:21.027559546 +0200
+++ /var/tmp/diff_new_pack.rfjDm5/_new 2019-07-08 16:24:21.031559550 +0200
@@ -17,7 +17,7 @@
Name: openSUSE-MicroOS-release
-Version: 20190705
+Version: 20190708
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -40,9 +40,9 @@
ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64
Provides: %name-%version
Provides: product() = openSUSE-MicroOS
-Provides: product(openSUSE-MicroOS) = 20190705-0
+Provides: product(openSUSE-MicroOS) = 20190708-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190705
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190708
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(openSUSE-MicroOS)
@@ -58,7 +58,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE-MicroOS) = 20190705-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190708-0
Summary: openSUSE MicroOS
%description dvd
@@ -74,7 +74,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(kubic-dvd)
-Provides: product_flavor(openSUSE-MicroOS) = 20190705-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190708-0
Summary: openSUSE MicroOS
%description kubic-dvd
@@ -90,7 +90,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE-MicroOS) = 20190705-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190708-0
Summary: openSUSE MicroOS
%description appliance
@@ -106,7 +106,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kubic)
-Provides: product_flavor(openSUSE-MicroOS) = 20190705-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190708-0
Summary: openSUSE MicroOS
%description appliance-kubic
@@ -164,11 +164,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-MicroOS</name>
- <version>20190705</version>
+ <version>20190708</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-microos:20190705</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-microos:20190708</cpeid>
<productline>openSUSE-MicroOS</productline>
<register>
<pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.rfjDm5/_old 2019-07-08 16:24:21.051559575 +0200
+++ /var/tmp/diff_new_pack.rfjDm5/_new 2019-07-08 16:24:21.051559575 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20190705
+Version: 20190708
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -55,7 +55,7 @@
Obsoletes: aaa_version
Obsoletes: openSUSE-Promo-release <= 11.1
Obsoletes: openSUSE-release-live <= 11.0
-Obsoletes: product_flavor(%{product}) < 20190705
+Obsoletes: product_flavor(%{product}) < 20190708
# bnc#826592
Provides: weakremover(kernel-default) < 3.11
Provides: weakremover(kernel-desktop) < 4.2
@@ -183,7 +183,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20190705-0
+Provides: product(openSUSE) = 20190708-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -197,7 +197,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190705
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190708
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -211,7 +211,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description ftp
@@ -226,7 +226,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description mini
@@ -241,7 +241,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description dvd
@@ -256,7 +256,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description livecd-kde
@@ -271,7 +271,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description livecd-x11
@@ -286,7 +286,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description livecd-gnome
@@ -301,7 +301,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description livecd-xfce
@@ -316,7 +316,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description usb-kde
@@ -331,7 +331,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description usb-gnome
@@ -346,7 +346,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description usb-x11
@@ -361,7 +361,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20190705-0
+Provides: product_flavor(openSUSE) = 20190708-0
Summary: openSUSE Tumbleweed
%description appliance
@@ -435,10 +435,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20190705</version>
+ <version>20190708</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20190705</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20190708</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.rfjDm5/_old 2019-07-08 16:24:21.147559692 +0200
+++ /var/tmp/diff_new_pack.rfjDm5/_new 2019-07-08 16:24:21.151559698 +0200
@@ -8304,6 +8304,7 @@
Provides: weakremover(fusecompress)
Provides: weakremover(fwupdate-devel)
Provides: weakremover(fwupdate-efi)
+Provides: weakremover(fwzs)
Provides: weakremover(gDesklets)
Provides: weakremover(gDesklets-lang)
Provides: weakremover(gambas3-gb-db-sqlite2)
@@ -12504,6 +12505,8 @@
Provides: weakremover(gstreamer-plugins-cogl)
Provides: weakremover(gstreamer-plugins-qt)
Provides: weakremover(gstreamer-plugins-qt-devel)
+Provides: weakremover(gstreamer-plugins-qt5)
+Provides: weakremover(gstreamer-plugins-qt5-devel)
Provides: weakremover(gsynaptics)
Provides: weakremover(gsynaptics-lang)
Provides: weakremover(gtef-2-lang)
@@ -13076,6 +13079,8 @@
Provides: weakremover(ksplashx-branding-openSUSE)
Provides: weakremover(kterm)
Provides: weakremover(ktexteditorpreviewplugin-lang)
+Provides: weakremover(ktp-call-ui)
+Provides: weakremover(ktp-call-ui-lang)
Provides: weakremover(kubernetes-404-server)
Provides: weakremover(kured-yaml)
Provides: weakremover(kuser)
@@ -20293,6 +20298,9 @@
Provides: weakremover(ruby2.6-rubygem-asciidoctor-testsuite)
Provides: weakremover(ruby2.6-rubygem-devise-testsuite)
Provides: weakremover(ruby2.6-rubygem-gem2rpm-doc)
+Provides: weakremover(ruby2.6-rubygem-json-schema-2_2)
+Provides: weakremover(ruby2.6-rubygem-json-schema-doc-2_2)
+Provides: weakremover(ruby2.6-rubygem-json-schema-testsuite-2_2)
Provides: weakremover(ruby2.6-rubygem-minitest)
Provides: weakremover(ruby2.6-rubygem-minitest-doc)
Provides: weakremover(ruby2.6-rubygem-minitest-testsuite)
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-07-08 16:07:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Mon Jul 8 16:07:24 2019 rev:1405 rq: version:unknown
Mon Jul 8 15:13:03 2019 rev:1404 rq: version:unknown
Mon Jul 8 15:13:02 2019 rev:1402 rq: version:unknown
Mon Jul 8 15:13:02 2019 rev:1403 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.763557998 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.763557998 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190705,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190708,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.779558018 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.779558018 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190705,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190708,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190705/…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190708/…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change
++++++ openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.807558052 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.807558052 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190705,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190708,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.819558067 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.823558071 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190705,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190708,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.835558086 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.835558086 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190705,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190708,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -4539,7 +4539,6 @@
<repopackage name="ruby2.6-rubygem-json"/>
<repopackage name="ruby2.6-rubygem-json-jwt"/>
<repopackage name="ruby2.6-rubygem-json-schema"/>
- <repopackage name="ruby2.6-rubygem-json-schema-2_2"/>
<repopackage name="ruby2.6-rubygem-json_pure"/>
<repopackage name="ruby2.6-rubygem-jwt"/>
<repopackage name="ruby2.6-rubygem-jwt-1_5"/>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.851558106 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.855558111 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190705,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190708,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -4780,7 +4780,6 @@
<repopackage name="ruby2.6-rubygem-json"/>
<repopackage name="ruby2.6-rubygem-json-jwt"/>
<repopackage name="ruby2.6-rubygem-json-schema"/>
- <repopackage name="ruby2.6-rubygem-json-schema-2_2"/>
<repopackage name="ruby2.6-rubygem-json_pure"/>
<repopackage name="ruby2.6-rubygem-jwt"/>
<repopackage name="ruby2.6-rubygem-jwt-1_5"/>
++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.867558125 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:19.867558125 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190705" schemaversion="4.1">
+<image name="OBS__openSUSE___20190708" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20190705-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20190708-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190705</productvar>
+ <productvar name="VERSION">20190708</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190705,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190708,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190705/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190708/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:19.999558287 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:20.003558293 +0200
@@ -4489,7 +4489,6 @@
<package name="ruby2.6-rubygem-json" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-json-jwt" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-json-schema" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
- <package name="ruby2.6-rubygem-json-schema-2_2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-json_pure" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-jwt" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-jwt-1_5" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
++++++ openSUSE-Addon-NonOss.product ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:20.015558307 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:20.015558307 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20190705</version>
+ <version>20190708</version>
<release>0</release>
<summary>openSUSE NonOSS Addon</summary>
<shortsummary>non oss addon</shortsummary>
++++++ openSUSE-MicroOS.product ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:20.027558322 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:20.031558326 +0200
@@ -6,7 +6,7 @@
<name>openSUSE-MicroOS</name>
<releasepkgname>openSUSE-MicroOS-release</releasepkgname>
<endoflife/>
- <version>20190705</version>
+ <version>20190708</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>openSUSE-MicroOS</productline>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:20.043558341 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:20.047558346 +0200
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20190705</version>
+ <version>20190708</version>
<release>0</release>
<productline>openSUSE</productline>
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.AOoNh8/_old 2019-07-08 16:24:20.127558444 +0200
+++ /var/tmp/diff_new_pack.AOoNh8/_new 2019-07-08 16:24:20.127558444 +0200
@@ -3062,7 +3062,6 @@
- fwnncom
- fwts
- fwupd-devel
- - fwzs
- fxload
- fzf
- fzf-bash-completion
@@ -4692,8 +4691,6 @@
- gstreamer-plugins-good-jack-32bit: [x86_64]
- gstreamer-plugins-libav-32bit: [x86_64]
- gstreamer-plugins-libav-doc
- - gstreamer-plugins-qt5
- - gstreamer-plugins-qt5-devel
- gstreamer-plugins-ugly-32bit: [x86_64]
- gstreamer-plugins-ugly-doc
- gstreamer-plugins-vaapi
@@ -6327,8 +6324,6 @@
- ktp-approver-lang
- ktp-auth-handler
- ktp-auth-handler-lang
- - ktp-call-ui
- - ktp-call-ui-lang
- ktp-common-internals
- ktp-common-internals-devel
- ktp-common-internals-lang
@@ -18360,7 +18355,6 @@
- python2-os-testr
- python2-os-win
- python2-osc-lib
- - python2-oscfs
- python2-oscrypto
- python2-oslo.cache
- python2-oslo.concurrency
@@ -22342,8 +22336,6 @@
- ruby2.6-rubygem-json-jwt-doc
- ruby2.6-rubygem-json-jwt-testsuite
- ruby2.6-rubygem-json-schema-doc
- - ruby2.6-rubygem-json-schema-doc-2_2
- - ruby2.6-rubygem-json-schema-testsuite-2_2
- ruby2.6-rubygem-json_pure-doc
- ruby2.6-rubygem-jwt-doc
- ruby2.6-rubygem-jwt-doc-1_5
1
0
Hello community,
here is the log from the commit of package xonsh for openSUSE:Factory checked in at 2019-07-08 15:11:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xonsh (Old)
and /work/SRC/openSUSE:Factory/.xonsh.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xonsh"
Mon Jul 8 15:11:56 2019 rev:16 rq:713860 version:0.9.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/xonsh/xonsh.changes 2019-06-13 23:03:24.871389875 +0200
+++ /work/SRC/openSUSE:Factory/.xonsh.new.4615/xonsh.changes 2019-07-08 15:11:59.831401055 +0200
@@ -1,0 +2,27 @@
+Sun Jun 30 13:32:26 UTC 2019 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 0.9.7:
+ - Added:
+ - add xontrib (xontrib-readable-traceback)
+ - Registered kitty xontrib.
+ - The zipapp extra was added to install the importlib.resources backport on <3.7
+ - Changed:
+ - turn off warning on completer
+ - xontrib metadata loading is now zipapp safe when possible
+ - Fixed:
+ - Updated py-bash-completion that is vended with xonsh to v0.2.6 which
+ includes a fix completion which uses a subshell environment and a
+ fix for string index error in stripped prefix.
+ - Removed obsolte "Alt+." keybinding in xontrib-bashisms that was causing built-in binding to malfunction.
+ - Fixed that occurs when type a command before rendering.
+- update to version 0.9.6:
+ - Fixed:
+ - Fixed exception in help/version threadable predictor
+ - Fixed gitstatus prompt so that it also now reports deleted files
+ - Fixed issue where the prompt-toolkit2 shell could not display and
+ would end up in an infinite error loop if ``$MULTILINE_PROMPT``
+ was a suitably "false" value, such as ``None`` or an empty string.
+ - Fixed issue where setting ``$XONSH_STDERR_PREFIX`` and ``$XONSH_STDERR_POSTFIX``
+ and running a command in the ``xonshrc`` file would throw an error.
+
+-------------------------------------------------------------------
Old:
----
xonsh-0.9.5.tar.gz
New:
----
xonsh-0.9.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xonsh.spec ++++++
--- /var/tmp/diff_new_pack.ularrL/_old 2019-07-08 15:12:00.711401899 +0200
+++ /var/tmp/diff_new_pack.ularrL/_new 2019-07-08 15:12:00.715401903 +0200
@@ -17,7 +17,7 @@
Name: xonsh
-Version: 0.9.5
+Version: 0.9.7
Release: 0
Summary: A general purpose, Python-ish shell
License: BSD-3-Clause AND BSD-2-Clause
++++++ xonsh-0.9.5.tar.gz -> xonsh-0.9.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/.appveyor.yml new/xonsh-0.9.7/.appveyor.yml
--- old/xonsh-0.9.5/.appveyor.yml 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/.appveyor.yml 2019-06-28 23:30:35.000000000 +0200
@@ -1,4 +1,4 @@
-version: 0.9.5.{build}
+version: 0.9.7.{build}
os: Windows Server 2012 R2
environment:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/.authors.yml new/xonsh-0.9.7/.authors.yml
--- old/xonsh-0.9.5/.authors.yml 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/.authors.yml 2019-06-28 23:30:35.000000000 +0200
@@ -7,6 +7,8 @@
email: 6syun9(a)gmail.com
aliases:
- '@vaaaaanquish'
+ - vaaaaanquish
+ - 6syun9
num_commits: 7
first_commit: 2018-07-17 01:14:04
github: vaaaaanquish
@@ -29,7 +31,8 @@
alternate_emails:
- jamie.bliss(a)ilq.com
- jbliss(a)nextgenerationenrollment.com
- num_commits: 188
+ - jamie(a)ivyleav.es
+ num_commits: 191
first_commit: 2016-07-20 14:05:08
github: astronouth7303
- name: Cody Scott
@@ -378,7 +381,7 @@
email: lalochcz(a)gmail.com
aliases:
- laloch
- num_commits: 41
+ num_commits: 42
first_commit: 2018-07-26 13:51:50
github: laloch
- name: Nico Lehmann
@@ -428,7 +431,7 @@
github: funkyfuture
- name: Anthony Scopatz
email: scopatz(a)gmail.com
- num_commits: 2465
+ num_commits: 2481
first_commit: 2015-01-21 17:04:13
github: scopatz
- name: anatoly techtonik
@@ -959,7 +962,7 @@
github: ntdef
- name: virus
email: virusbb001a(a)gmail.com
- num_commits: 24
+ num_commits: 30
first_commit: 2019-03-06 10:36:26
github: virusbb001
- name: Steven Kryskalla
@@ -990,7 +993,7 @@
first_commit: 2019-05-06 14:17:57
- name: con-f-use
email: con-f-use(a)users.noreply.github.com
- num_commits: 3
+ num_commits: 8
first_commit: 2019-05-15 04:53:37
- name: cclauss
email: cclauss(a)me.com
@@ -1002,3 +1005,12 @@
num_commits: 2
first_commit: 2019-05-10 06:18:40
github: eppeters
+- name: shadow-light
+ email: 42055707+shadow-light(a)users.noreply.github.com
+ num_commits: 3
+ first_commit: 2018-09-16 22:50:24
+- name: Gyuri Horak
+ email: dyuri(a)horak.hu
+ num_commits: 1
+ first_commit: 2019-06-18 12:00:16
+ github: dyuri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/.github/issue_template.md new/xonsh-0.9.7/.github/issue_template.md
--- old/xonsh-0.9.5/.github/issue_template.md 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/.github/issue_template.md 2019-06-28 23:30:35.000000000 +0200
@@ -6,9 +6,11 @@
## xonfig
<details>
+
```
$ xonfig
```
+
</details>
## Expected Behavior
@@ -17,15 +19,17 @@
## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->
<!--- If part of your bug report is a traceback, please first enter debug mode before triggering the error
-To enter debug mode, set the environment variable `XONSH_DEBUG=1` _before_ starting `xonsh`.
+To enter debug mode, set the environment variable `XONSH_DEBUG=1` _before_ starting `xonsh`.
On Linux and OSX, an easy way to to do this is to run `env XONSH_DEBUG=1 xonsh` -->
### Traceback (if applicable)
<details>
+
```
traceback
```
+
</details>
## Steps to Reproduce
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/.mailmap new/xonsh-0.9.7/.mailmap
--- old/xonsh-0.9.5/.mailmap 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/.mailmap 2019-06-28 23:30:35.000000000 +0200
@@ -18,6 +18,7 @@
Konstantinos Tsakiltzidis <laerusk(a)gmail.com> laerus <laerusk(a)gmail.com>
Jamie Bliss <astronouth7303(a)gmail.com> James Bliss <jamie.bliss(a)ilq.com>
Jamie Bliss <astronouth7303(a)gmail.com> James Bliss <jbliss(a)nextgenerationenrollment.com>
+Jamie Bliss <astronouth7303(a)gmail.com> James Bliss <jamie(a)ivyleav.es>
Hugo Wang <w(a)mitnk.com>
BlahGeek <i(a)BlahGeek.com>
Jean-Benoist Leger <jb(a)leger.tf> Jean-Benoist Leger <jbleger@gertrude>
@@ -32,11 +33,11 @@
Burak Yiğit Kaya <ben(a)byk.im> Burak Yigit Kaya <ben(a)byk.im>
Sagar Tewari <sagartewari01(a)gmail.com> Sagar Tewari <sagartewariym(a)yahoo.com>
Matthias Bussonnier <bussonniermatthias(a)gmail.com>
+virus <virusbb001a(a)gmail.com>
Konstantin Molchanov <kmolchanov(a)machinezone.com> Konstantin Molchanov <moigagoo(a)live.com>
Guillaume Leclerc <guillaume.leclerc(a)epfl.ch> Guillaume Leclerc <guillaume.leclerc.work(a)gmail.com>
Gordon Ball <gordon(a)chronitis.net>
Travis Shirk <travis(a)pobox.com>
-virus <virusbb001a(a)gmail.com>
Joel Gerber <joel(a)grrbrr.ca>
Bernardas Ališauskas <bernardas.alisauskas(a)gmail.com> Bernardas <bernardas.alisauskas(a)gmail.com>
Derek Thomas <derekathomas(a)gmail.com>
@@ -60,7 +61,10 @@
Oleh Prypin <oleh(a)pryp.in>
Brian Skinn <brian.skinn(a)gmail.com>
Will S <wsha.code(a)gmail.com>
+con-f-use <con-f-use(a)users.noreply.github.com>
vaaaaanquish <6syun9(a)gmail.com> @vaaaaanquish <6syun9(a)gmail.com>
+vaaaaanquish <6syun9(a)gmail.com> vaaaaanquish <6syun9(a)gmail.com>
+vaaaaanquish <6syun9(a)gmail.com> 6syun9 <6syun9(a)gmail.com>
Alessio Bogon <youtux(a)gmail.com> Alessio Bogon <youtux(a)users.noreply.github.com>
Yohei Tamura <tamuhey(a)gmail.com>
Maximilian Köhl <mail(a)koehlma.de>
@@ -127,7 +131,7 @@
Danmou <dmrtzn(a)gmail.com>
Niklas Hambüchen <mail(a)nh2.me>
Sébastien Pierre <sebastien.pierre(a)gmail.com>
-con-f-use <con-f-use(a)users.noreply.github.com>
+shadow-light <42055707+shadow-light(a)users.noreply.github.com>
Mark Wiebe <mwwiebe(a)gmail.com>
Nathan Hoad <nathan(a)getoffmalawn.com>
Eric Dill <edill(a)bnl.gov>
@@ -207,5 +211,6 @@
Ronny Pfannschmidt <opensource(a)ronnypfannschmidt.de>
Troy de Freitas <9503857+ntdef(a)users.noreply.github.com>
Rodrigo Oliveira <rodrigo.oliveira(a)byne.com.br>
+Gyuri Horak <dyuri(a)horak.hu>
goodboy <tgoodlet(a)users.noreply.github.com>
Atsushi Morimoto <atsushi.morimoto(a)dena.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/AUTHORS.rst new/xonsh-0.9.7/AUTHORS.rst
--- old/xonsh-0.9.5/AUTHORS.rst 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/AUTHORS.rst 2019-06-28 23:30:35.000000000 +0200
@@ -20,11 +20,11 @@
* Burak Yiğit Kaya
* Sagar Tewari
* Matthias Bussonnier
+* virus
* Konstantin Molchanov
* Guillaume Leclerc
* Gordon Ball
* Travis Shirk
-* virus
* Joel Gerber
* Bernardas Ališauskas
* Derek Thomas
@@ -48,6 +48,7 @@
* Oleh Prypin
* Brian Skinn
* Will S
+* con-f-use
* vaaaaanquish
* Alessio Bogon
* Yohei Tamura
@@ -115,7 +116,7 @@
* Danmou
* Niklas Hambüchen
* Sébastien Pierre
-* con-f-use
+* shadow-light
* Mark Wiebe
* Nathan Hoad
* Eric Dill
@@ -195,6 +196,7 @@
* Ronny Pfannschmidt
* Troy de Freitas
* Rodrigo Oliveira
+* Gyuri Horak
* goodboy
* Atsushi Morimoto
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/CHANGELOG.rst new/xonsh-0.9.7/CHANGELOG.rst
--- old/xonsh-0.9.5/CHANGELOG.rst 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/CHANGELOG.rst 2019-06-28 23:30:35.000000000 +0200
@@ -4,6 +4,60 @@
.. current developments
+v0.9.7
+====================
+
+**Added:**
+
+* add xontrib (xontrib-readable-traceback)
+* Registered kitty xontrib.
+* The zipapp extra was added to install the importlib.resources backport on <3.7
+
+**Changed:**
+
+* turn off warning on completer
+* xontrib metadata loading is now zipapp safe when possible
+
+**Fixed:**
+
+* Updated py-bash-completion that is vended with xonsh to v0.2.6 which
+ includes a fix completion which uses a subshell environment and a
+ fix for string index error in stripped prefix.
+* Removed obsolte "Alt+." keybinding in xontrib-bashisms that was causing built-in binding to malfunction.
+* Fixed that occurs when type a command before rendering.
+
+**Authors:**
+
+* Anthony Scopatz
+* Jamie Bliss
+* con-f-use
+* vaaaaanquish
+* Gyuri Horak
+
+
+
+v0.9.6
+====================
+
+**Fixed:**
+
+* Fixed exception in help/version threadable predictor
+* Fixed gitstatus prompt so that it also now reports deleted files
+* Fixed issue where the prompt-toolkit2 shell could not display and
+ would end up in an infinite error loop if ``$MULTILINE_PROMPT``
+ was a suitably "false" value, such as ``None`` or an empty string.
+* Fixed issue where setting ``$XONSH_STDERR_PREFIX`` and ``$XONSH_STDERR_POSTFIX``
+ and running a command in the ``xonshrc`` file would throw an error.
+
+**Authors:**
+
+* Anthony Scopatz
+* David Strobach
+* virus
+* shadow-light
+
+
+
v0.9.5
====================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/ci/environment-3.5.yml new/xonsh-0.9.7/ci/environment-3.5.yml
--- old/xonsh-0.9.5/ci/environment-3.5.yml 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/ci/environment-3.5.yml 2019-06-28 23:30:35.000000000 +0200
@@ -10,7 +10,6 @@
- pytest-timeout
- numpy
- psutil
- - matplotlib
- flake8
- coverage
- pyflakes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/docs/_static/numpy_friendly.css_t new/xonsh-0.9.7/docs/_static/numpy_friendly.css_t
--- old/xonsh-0.9.5/docs/_static/numpy_friendly.css_t 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/docs/_static/numpy_friendly.css_t 2019-06-28 23:30:35.000000000 +0200
@@ -3,3 +3,8 @@
table.docutils th.field-name {
white-space: nowrap;
}
+
+p code.literal {
+ white-space: normal;
+ word-wrap: break-word;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/setup.py new/xonsh-0.9.7/setup.py
--- old/xonsh-0.9.5/setup.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/setup.py 2019-06-28 23:30:35.000000000 +0200
@@ -402,6 +402,7 @@
"mac": ["gnureadline"],
"linux": ["distro"],
"proctitle": ["setproctitle"],
+ "zipapp": ['importlib_resources; python_version < "3.7"'],
}
skw["python_requires"] = ">=3.5"
setup(**skw)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/__init__.py new/xonsh-0.9.7/xonsh/__init__.py
--- old/xonsh-0.9.5/xonsh/__init__.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/__init__.py 2019-06-28 23:30:35.000000000 +0200
@@ -1,4 +1,4 @@
-__version__ = "0.9.5"
+__version__ = "0.9.7"
# amalgamate exclude jupyter_kernel parser_table parser_test_table pyghooks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/commands_cache.py new/xonsh-0.9.7/xonsh/commands_cache.py
--- old/xonsh-0.9.5/xonsh/commands_cache.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/commands_cache.py 2019-06-28 23:30:35.000000000 +0200
@@ -380,9 +380,9 @@
@lazyobject
def HELP_VER_PREDICTOR_PARSER():
p = argparse.ArgumentParser("cmd", add_help=False)
- p.add_argument("-h", "--help", dest="help", action="store_true", default=None)
+ p.add_argument("-h", "--help", dest="help", nargs="?", action="store", default=None)
p.add_argument(
- "-v", "-V", "--version", dest="version", action="store_true", default=None
+ "-v", "-V", "--version", dest="version", nargs="?", action="store", default=None
)
return p
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/completers/bash_completion.py new/xonsh-0.9.7/xonsh/completers/bash_completion.py
--- old/xonsh-0.9.5/xonsh/completers/bash_completion.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/completers/bash_completion.py 2019-06-28 23:30:35.000000000 +0200
@@ -14,7 +14,7 @@
import functools
import subprocess
-__version__ = "0.2.5"
+__version__ = "0.2.6"
@functools.lru_cache(1)
@@ -228,6 +228,18 @@
complete -p {cmd} 2> /dev/null || echo "-F _minimal"
}}
+function getarg {{
+ find=$1
+ shift 1
+ prev=""
+ for i in $* ; do
+ if [ "$prev" = "$find" ] ; then
+ echo $i
+ fi
+ prev=$i
+ done
+}}
+
_complete_stmt=$(_get_complete_statement)
if echo "$_complete_stmt" | grep --quiet -e "_minimal"
then
@@ -235,15 +247,20 @@
_complete_stmt=$(_get_complete_statement)
fi
-_func=$(echo "$_complete_stmt" | grep -o -e '-F \w\+' | cut -d ' ' -f 2)
-declare -f "$_func" > /dev/null || exit 1
+# Is -C (subshell) or -F (function) completion used?
+if [[ $_complete_stmt =~ "-C" ]] ; then
+ _func=$(eval getarg "-C" $_complete_stmt)
+else
+ _func=$(eval getarg "-F" $_complete_stmt)
+ declare -f "$_func" > /dev/null || exit 1
+fi
echo "$_complete_stmt"
-COMP_WORDS=({line})
-COMP_LINE={comp_line}
-COMP_POINT=${{#COMP_LINE}}
-COMP_COUNT={end}
-COMP_CWORD={n}
+export COMP_WORDS=({line})
+export COMP_LINE={comp_line}
+export COMP_POINT=${{#COMP_LINE}}
+export COMP_COUNT={end}
+export COMP_CWORD={n}
$_func {cmd} {prefix} {prev}
# print out completions, right-stripped if they contain no internal spaces
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/completers/python.py new/xonsh-0.9.7/xonsh/completers/python.py
--- old/xonsh-0.9.5/xonsh/completers/python.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/completers/python.py 2019-06-28 23:30:35.000000000 +0200
@@ -4,6 +4,7 @@
import inspect
import builtins
import importlib
+import warnings
import collections.abc as cabc
import xonsh.tools as xt
@@ -184,6 +185,18 @@
return set(prefix_start + i for i in python_matches)
+def _turn_off_warning(func):
+ """Decorator to turn off warning temporarily."""
+
+ def wrapper(*args, **kwargs):
+ warnings.filterwarnings("ignore")
+ r = func(*args, **kwargs)
+ warnings.filterwarnings("once", category=DeprecationWarning)
+ return r
+
+ return wrapper
+
+
def _safe_eval(expr, ctx):
"""Safely tries to evaluate an expression. If this fails, it will return
a (None, None) tuple.
@@ -202,6 +215,7 @@
return val, _ctx
+@_turn_off_warning
def attr_complete(prefix, ctx, filter_func):
"""Complete attributes of an object."""
attrs = set()
@@ -243,6 +257,7 @@
return attrs
+@_turn_off_warning
def python_signature_complete(prefix, line, end, ctx, filter_func):
"""Completes a python function (or other callable) call by completing
argument and keyword argument names.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/environ.py new/xonsh-0.9.7/xonsh/environ.py
--- old/xonsh-0.9.5/xonsh/environ.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/environ.py 2019-06-28 23:30:35.000000000 +0200
@@ -975,7 +975,35 @@
configurable=ON_WINDOWS,
),
"LANG": VarDocs("Fallback locale setting for systems where it matters"),
- "LS_COLORS": VarDocs("Color settings for ``ls`` command line utility"),
+ "LS_COLORS": VarDocs(
+ "Color settings for ``ls`` command line utility",
+ default="``*.7z=1;0;31:*.Z=1;0;31:*.aac=0;36:*.ace=1;0;31:"
+ "*.alz=1;0;31:*.arc=1;0;31:*.arj=1;0;31:*.asf=1;0;35:*.au=0;36:"
+ "*.avi=1;0;35:*.bmp=1;0;35:*.bz=1;0;31:*.bz2=1;0;31:*.cab=1;0;31:"
+ "*.cgm=1;0;35:*.cpio=1;0;31:*.deb=1;0;31:*.dl=1;0;35:*.dwm=1;0;31:"
+ "*.dz=1;0;31:*.ear=1;0;31:*.emf=1;0;35:*.esd=1;0;31:*.flac=0;36:"
+ "*.flc=1;0;35:*.fli=1;0;35:*.flv=1;0;35:*.gif=1;0;35:*.gl=1;0;35:"
+ "*.gz=1;0;31:*.jar=1;0;31:*.jpeg=1;0;35:*.jpg=1;0;35:*.lha=1;0;31:"
+ "*.lrz=1;0;31:*.lz=1;0;31:*.lz4=1;0;31:*.lzh=1;0;31:*.lzma=1;0;31"
+ ":*.lzo=1;0;31:*.m2v=1;0;35:*.m4a=0;36:*.m4v=1;0;35:*.mid=0;36:"
+ "*.midi=0;36:*.mjpeg=1;0;35:*.mjpg=1;0;35:*.mka=0;36:*.mkv=1;0;35:"
+ "*.mng=1;0;35:*.mov=1;0;35:*.mp3=0;36:*.mp4=1;0;35:*.mp4v=1;0;35:"
+ "*.mpc=0;36:*.mpeg=1;0;35:*.mpg=1;0;35:*.nuv=1;0;35:*.oga=0;36:"
+ "*.ogg=0;36:*.ogm=1;0;35:*.ogv=1;0;35:*.ogx=1;0;35:*.opus=0;36:"
+ "*.pbm=1;0;35:*.pcx=1;0;35:*.pgm=1;0;35:*.png=1;0;35:*.ppm=1;0;35:"
+ "*.qt=1;0;35:*.ra=0;36:*.rar=1;0;31:*.rm=1;0;35:*.rmvb=1;0;35:"
+ "*.rpm=1;0;31:*.rz=1;0;31:*.sar=1;0;31:*.spx=0;36:*.svg=1;0;35:"
+ "*.svgz=1;0;35:*.swm=1;0;31:*.t7z=1;0;31:*.tar=1;0;31:*.taz=1;0;31:"
+ "*.tbz=1;0;31:*.tbz2=1;0;31:*.tga=1;0;35:*.tgz=1;0;31:*.tif=1;0;35:"
+ "*.tiff=1;0;35:*.tlz=1;0;31:*.txz=1;0;31:*.tz=1;0;31:*.tzo=1;0;31:"
+ "*.tzst=1;0;31:*.vob=1;0;35:*.war=1;0;31:*.wav=0;36:*.webm=1;0;35:"
+ "*.wim=1;0;31:*.wmv=1;0;35:*.xbm=1;0;35:*.xcf=1;0;35:*.xpm=1;0;35:"
+ "*.xspf=0;36:*.xwd=1;0;35:*.xz=1;0;31:*.yuv=1;0;35:*.z=1;0;31:"
+ "*.zip=1;0;31:*.zoo=1;0;31:*.zst=1;0;31:bd=40;0;33:ca=0;30;41:"
+ "cd=40;0;33:di=1;0;34:do=1;0;35:ex=1;0;32:ln=1;0;36:mh=0:mi=0:"
+ "or=40;0;31:ow=0;34;42:pi=40;0;33:rs=0:sg=0;30;43:so=1;0;35:"
+ "st=0;37;44:su=0;37;41:tw=0;30;42``",
+ ),
"LOADED_RC_FILES": VarDocs(
"Whether or not any of the xonsh run control files were loaded at "
"startup. This is a sequence of bools in Python that is converted "
@@ -998,7 +1026,19 @@
"Used to represent a previous present working directory.",
configurable=False,
),
- "PATH": VarDocs("List of strings representing where to look for executables."),
+ "PATH": VarDocs(
+ "List of strings representing where to look for executables.",
+ default="On Windows: it is ``Path`` value of register's "
+ "``HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment``. "
+ "On Mac OSX: ``('/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin')`` "
+ "On Linux & on Cygwin & on MSYS, when detected that the distro "
+ "is like arch, the default PATH is "
+ "``('/usr/local/sbin', '/usr/local/bin', '/usr/bin', "
+ "'/usr/bin/site_perl', '/usr/bin/vendor_perl', '/usr/bin/core_perl')``"
+ " and otherwise is "
+ "``('~/bin', '/usr/local/sbin', '/usr/local/bin', '/usr/sbin',"
+ "'/usr/bin', '/sbin', '/bin', '/usr/games', '/usr/local/games')``",
+ ),
"PATHEXT": VarDocs(
"Sequence of extension strings (eg, ``.EXE``) for "
"filtering valid executables by. Each element must be "
@@ -1158,7 +1198,8 @@
),
),
"XONSH_APPEND_NEWLINE": VarDocs(
- "Append new line when a partial line is preserved in output."
+ "Append new line when a partial line is preserved in output.",
+ default="``$XONSH_INTERACTIVE``",
),
"XONSH_AUTOPAIR": VarDocs(
"Whether Xonsh will auto-insert matching parentheses, brackets, and "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/prompt/gitstatus.py new/xonsh-0.9.7/xonsh/prompt/gitstatus.py
--- old/xonsh-0.9.5/xonsh/prompt/gitstatus.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/prompt/gitstatus.py 2019-06-28 23:30:35.000000000 +0200
@@ -17,6 +17,7 @@
"num_behind",
"untracked",
"changed",
+ "deleted",
"conflicts",
"staged",
"stashed",
@@ -70,6 +71,7 @@
"STAGED": "{RED}●",
"CONFLICTS": "{RED}×",
"CHANGED": "{BLUE}+",
+ "DELETED": "{RED}-",
"UNTRACKED": "…",
"STASHED": "⚑",
"CLEAN": "{BOLD_GREEN}✓",
@@ -114,12 +116,12 @@
def gitstatus():
"""Return namedtuple with fields:
branch name, number of ahead commit, number of behind commit,
- untracked number, changed number, conflicts number,
+ untracked number, changed number, deleted number, conflicts number,
staged number, stashed number, operation."""
status = _check_output(["git", "status", "--porcelain", "--branch"])
branch = ""
num_ahead, num_behind = 0, 0
- untracked, changed, conflicts, staged = 0, 0, 0, 0
+ untracked, changed, deleted, conflicts, staged = 0, 0, 0, 0, 0
for line in status.splitlines():
if line.startswith("##"):
line = line[2:].strip()
@@ -142,9 +144,11 @@
elif line.startswith("??"):
untracked += 1
else:
- if len(line) > 1 and line[1] == "M":
- changed += 1
-
+ if len(line) > 1:
+ if line[1] == "M":
+ changed += 1
+ elif line[1] == "D":
+ deleted += 1
if len(line) > 0 and line[0] == "U":
conflicts += 1
elif len(line) > 0 and line[0] != " ":
@@ -160,6 +164,7 @@
num_behind,
untracked,
changed,
+ deleted,
conflicts,
staged,
stashed,
@@ -188,11 +193,13 @@
ret += _get_def("CONFLICTS") + str(s.conflicts) + "{NO_COLOR}"
if s.changed > 0:
ret += _get_def("CHANGED") + str(s.changed) + "{NO_COLOR}"
+ if s.deleted > 0:
+ ret += _get_def("DELETED") + str(s.deleted) + "{NO_COLOR}"
if s.untracked > 0:
ret += _get_def("UNTRACKED") + str(s.untracked) + "{NO_COLOR}"
if s.stashed > 0:
ret += _get_def("STASHED") + str(s.stashed) + "{NO_COLOR}"
- if s.staged + s.conflicts + s.changed + s.untracked + s.stashed == 0:
+ if s.staged + s.conflicts + s.changed + s.deleted + s.untracked + s.stashed == 0:
ret += _get_def("CLEAN") + "{NO_COLOR}"
ret += "{NO_COLOR}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/ptk2/completer.py new/xonsh-0.9.7/xonsh/ptk2/completer.py
--- old/xonsh-0.9.5/xonsh/ptk2/completer.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/ptk2/completer.py 2019-06-28 23:30:35.000000000 +0200
@@ -101,4 +101,5 @@
last_h = render._last_screen.height if render._last_screen else 0
last_h = max(render._min_available_height, last_h)
if last_h < size:
- render._last_screen.height = size
+ if render._last_screen:
+ render._last_screen.height = size
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/ptk2/shell.py new/xonsh-0.9.7/xonsh/ptk2/shell.py
--- old/xonsh-0.9.5/xonsh/ptk2/shell.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/ptk2/shell.py 2019-06-28 23:30:35.000000000 +0200
@@ -252,8 +252,8 @@
width = width - 1
dots = builtins.__xonsh__.env.get("MULTILINE_PROMPT")
dots = dots() if callable(dots) else dots
- if dots is None:
- return [(Token, " " * (width + 1))]
+ if not dots:
+ return ""
basetoks = self.format_color(dots)
baselen = sum(len(t[1]) for t in basetoks)
if baselen == 0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/tools.py new/xonsh-0.9.7/xonsh/tools.py
--- old/xonsh-0.9.5/xonsh/tools.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/tools.py 2019-06-28 23:30:35.000000000 +0200
@@ -1948,16 +1948,27 @@
if not template:
return ""
env = builtins.__xonsh__.env if env is None else env
- shell = builtins.__xonsh__.shell.shell
- try:
- s = shell.prompt_formatter(template)
- except Exception:
- print_exception()
- # \001\002 is there to fool pygments into not returning an empty string
- # for potentially empty input. This happens when the template is just a
- # color code with no visible text.
invis = "\001\002"
- s = shell.format_color(invis + s + invis, force_string=True)
+ if builtins.__xonsh__.shell is None:
+ # shell hasn't fully started up (probably still in xonshrc)
+ from xonsh.prompt.base import PromptFormatter
+ from xonsh.ansi_colors import ansi_partial_color_format
+
+ pf = PromptFormatter()
+ s = pf(template)
+ style = env.get("XONSH_COLOR_STYLE")
+ s = ansi_partial_color_format(invis + s + invis, hide=False, style=style)
+ else:
+ # shell has fully started. do the normal thing
+ shell = builtins.__xonsh__.shell.shell
+ try:
+ s = shell.prompt_formatter(template)
+ except Exception:
+ print_exception()
+ # \001\002 is there to fool pygments into not returning an empty string
+ # for potentially empty input. This happens when the template is just a
+ # color code with no visible text.
+ s = shell.format_color(invis + s + invis, force_string=True)
s = s.replace(invis, "")
return s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/xontribs.json new/xonsh-0.9.7/xonsh/xontribs.json
--- old/xonsh-0.9.5/xonsh/xontribs.json 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/xontribs.json 2019-06-28 23:30:35.000000000 +0200
@@ -15,6 +15,11 @@
"description": ["Adds automatic execution of xonsh script files called",
"``.autoxsh`` when enterting a directory with ``cd`` function"]
},
+ {"name": "avox",
+ "package": "xontrib-avox",
+ "url": "https://github.com/astronouth7303/xontrib-avox",
+ "description": ["Automatic (de)activation of virtual environments as you cd around"]
+ },
{"name": "bashisms",
"package": "xonsh",
"url": "http://xon.sh",
@@ -33,6 +38,11 @@
"url": "https://github.com/ErickTucto/xontrib-base16-shell",
"description": ["Change base16 shell themes"]
},
+ {"name": "click_tabcomplete",
+ "package": "xonsh-click-tabcomplete",
+ "url": "https://github.com/Granitosaurus/xonsh-click-tabcomplete",
+ "description": ["Adds tabcomplete functionality to click based python applications inside of xonsh."]
+ },
{"name": "coreutils",
"package": "xonsh",
"url": "http://xon.sh",
@@ -79,6 +89,24 @@
"url": "https://github.com/xsteadfastx/xonsh-docker-tabcomplete",
"description": ["Adds tabcomplete functionality to docker inside of xonsh."]
},
+ {"name": "free_cwd",
+ "package": "xonsh",
+ "url": "http://xon.sh",
+ "description": [
+ "Windows only xontrib, to release the lock on the current directory ",
+ "whenever the prompt is shown. Enabling this will allow the other ",
+ "programs or Windows Explorer to delete or rename the current or parent ",
+ "directories. Internally, it is accomplished by temporarily resetting ",
+ "CWD to the root drive folder while waiting at the prompt. This only ",
+ "works with the prompt_toolkit backend and can cause cause issues ",
+ "if any extensions are enabled that hook the prompt and relies on ",
+ "``os.getcwd()``"]
+ },
+ {"name": "fzf-widgets",
+ "package": "xontrib-fzf-widgets",
+ "url": "https://github.com/shahinism/xontrib-fzf-widgets",
+ "description": ["Adds some fzf widgets to your xonsh shell."]
+ },
{"name": "histcpy",
"package": "xontrib-histcpy",
"url": "https://github.com/con-f-use/xontrib-histcpy",
@@ -92,42 +120,52 @@
"url": "http://xon.sh",
"description": ["Jedi tab completion hooks for xonsh."]
},
+ {"name": "kitty",
+ "package": "xontrib-kitty",
+ "url": "https://github.com/scopatz/xontrib-kitty",
+ "description": ["Xonsh hooks for the Kitty terminal emulator."]
+ },
{"name": "mpl",
"package": "xonsh",
"url": "http://xon.sh",
"description": ["Matplotlib hooks for xonsh, including the new 'mpl' alias ",
"that displays the current figure on the screen."]
},
+ {"name": "powerline",
+ "package": "xontrib-powerline",
+ "url": "https://github.com/santagada/xontrib-powerline",
+ "description": ["Powerline for Xonsh shell"]
+ },
{"name": "prompt_ret_code",
"package": "xonsh",
"url": "http://xon.sh",
"description": ["Adds return code info to the prompt"]
},
- {"name": "free_cwd",
- "package": "xonsh",
- "url": "http://xon.sh",
- "description": [
- "Windows only xontrib, to release the lock on the current directory ",
- "whenever the prompt is shown. Enabling this will allow the other ",
- "programs or Windows Explorer to delete or rename the current or parent ",
- "directories. Internally, it is accomplished by temporarily resetting ",
- "CWD to the root drive folder while waiting at the prompt. This only ",
- "works with the prompt_toolkit backend and can cause cause issues ",
- "if any extensions are enabled that hook the prompt and relies on ",
- "``os.getcwd()``"]
+ {"name": "prompt_vi_mode",
+ "package": "xontrib-prompt-vi-mode",
+ "url": "https://github.com/t184256/xontrib-prompt-vi-mode",
+ "description": ["vi-mode status formatter for xonsh prompt"]
+ },
+ {"name": "readable-traceback",
+ "package": "xontrib-readable-traceback",
+ "url": "https://github.com/6syun9/xontrib-readable-traceback",
+ "description": ["Make traceback easier to see for xonsh."]
},
- {"name": "whole_word_jumping",
- "package": "xonsh",
- "url": "http://xon.sh",
- "description": [
- "Jumping across whole words (non-whitespace) with Ctrl+Left/Right.",
- "Alt+Left/Right remains unmodified to jump over smaller word segments."]
+ {"name": "schedule",
+ "package": "xontrib-schedule",
+ "url": "https://github.com/astronouth7303/xontrib-schedule",
+ "description": ["Xonsh Task Scheduling"]
},
{"name": "scrapy_tabcomplete",
"package": "xonsh-scrapy-tabcomplete",
"url": "https://github.com/Granitas/xonsh-scrapy-tabcomplete",
"description": ["Adds tabcomplete functionality to scrapy inside of xonsh."]
},
+ {"name": "ssh_agent",
+ "package": "xontrib-ssh-agent",
+ "url": "https://bitbucket.org/dyuri/xontrib-ssh-agent",
+ "description": ["ssh-agent integration"]
+ },
{"name": "vox",
"package": "xonsh",
"url": "http://xon.sh",
@@ -138,6 +176,13 @@
"url": "https://github.com/Granitosaurus/xonsh-vox-tabcomplete",
"description": ["Adds tabcomplete functionality to vox inside of xonsh."]
},
+ {"name": "whole_word_jumping",
+ "package": "xonsh",
+ "url": "http://xon.sh",
+ "description": [
+ "Jumping across whole words (non-whitespace) with Ctrl+Left/Right.",
+ "Alt+Left/Right remains unmodified to jump over smaller word segments."]
+ },
{"name": "xo",
"package": "exofrills",
"url": "https://github.com/scopatz/xo",
@@ -151,40 +196,10 @@
"url": "https://github.com/gforsyth/xonda",
"description": ["A thin wrapper around conda with tab completion"]
},
- {"name": "avox",
- "package": "xontrib-avox",
- "url": "https://github.com/astronouth7303/xontrib-avox",
- "description": ["Automatic (de)activation of virtual environments as you cd around"]
- },
{"name": "z",
"package": "xontrib-z",
"url": "https://github.com/astronouth7303/xontrib-z",
"description": ["Tracks your most used directories, based on 'frecency'."]
- },
- {"name": "powerline",
- "package": "xontrib-powerline",
- "url": "https://github.com/santagada/xontrib-powerline",
- "description": ["Powerline for Xonsh shell"]
- },
- {"name": "prompt_vi_mode",
- "package": "xontrib-prompt-vi-mode",
- "url": "https://github.com/t184256/xontrib-prompt-vi-mode",
- "description": ["vi-mode status formatter for xonsh prompt"]
- },
- {"name": "click_tabcomplete",
- "package": "xonsh-click-tabcomplete",
- "url": "https://github.com/Granitosaurus/xonsh-click-tabcomplete",
- "description": ["Adds tabcomplete functionality to click based python applications inside of xonsh."]
- },
- {"name": "fzf-widgets",
- "package": "xontrib-fzf-widgets",
- "url": "https://github.com/shahinism/xontrib-fzf-widgets",
- "description": ["Adds some fzf widgets to your xonsh shell."]
- },
- {"name": "schedule",
- "package": "xontrib-schedule",
- "url": "https://github.com/astronouth7303/xontrib-schedule",
- "description": ["Xonsh Task Scheduling"]
}
],
"packages": {
@@ -204,11 +219,11 @@
"aura": "sudo aura -A xonsh",
"yaourt": "yaourt -Sa xonsh"}
},
- "xontrib-prompt-ret-code": {
- "license": "MIT",
- "url": "https://github.com/Siecje/xontrib-prompt-ret-code",
+ "xonsh-autoxsh": {
+ "license": "GPLv3",
+ "url": "https://github.com/Granitas/xonsh-autoxsh",
"install": {
- "pip": "xpip install xontrib-prompt-ret-code"
+ "pip": "xpip install xonsh-autoxsh"
}
},
"xonsh-apt-tabcomplete": {
@@ -218,6 +233,13 @@
"pip": "xpip install xonsh-apt-tabcomplete"
}
},
+ "xonsh-click-tabcomplete": {
+ "license": "GPLv3",
+ "url": "https://github.com/Granitosaurus/xonsh-click-tabcomplete",
+ "install": {
+ "pip": "xpip install xonsh-click-tabcomplete"
+ }
+ },
"xonsh-direnv": {
"license": "MIT",
"url": "https://github.com/74th/xonsh-direnv",
@@ -246,20 +268,6 @@
"pip": "xpip install xonsh-vox-tabcomplete"
}
},
- "xonsh-click-tabcomplete": {
- "license": "GPLv3",
- "url": "https://github.com/Granitosaurus/xonsh-click-tabcomplete",
- "install": {
- "pip": "xpip install xonsh-click-tabcomplete"
- }
- },
- "xonsh-autoxsh": {
- "license": "GPLv3",
- "url": "https://github.com/Granitas/xonsh-autoxsh",
- "install": {
- "pip": "xpip install xonsh-autoxsh"
- }
- },
"xonda": {
"license": "MIT",
"url": "https://github.com/gforsyth/xonda",
@@ -274,32 +282,33 @@
"pip": "xpip install xontrib-avox"
}
},
- "xontrib-histcpy": {
+ "xontrib-fzf-widgets": {
"license": "GPLv3",
- "url": "https://github.com/con-f-use/xontrib-histcpy",
+ "url": "https://github.com/shahinism/xontrib-fzf-widgets",
"install": {
- "pip": "xpip install xontrib-histcpy"
+ "pip": "xpip install xontrib-fzf-widgets"
}
},
- "xontrib-z": {
+ "xontrib-histcpy": {
"license": "GPLv3",
- "url": "https://github.com/astronouth7303/xontrib-z",
+ "url": "https://github.com/con-f-use/xontrib-histcpy",
"install": {
- "pip": "xpip install xontrib-z"
+ "pip": "xpip install xontrib-histcpy"
}
},
- "xontrib-powerline": {
- "license": "MIT",
- "url": "https://github.com/santagada/xontrib-powerline",
+ "xontrib-kitty": {
+ "license": "BSD-3-Clause",
+ "url": "https://github.com/scopatz/xontrib-kitty",
"install": {
- "pip": "xpip install xontrib-powerline"
+ "conda": "conda install -c conda-forge xontrib-kitty",
+ "pip": "xpip install xontrib-kitty"
}
},
- "xontrib-thefuck": {
+ "xontrib-prompt-ret-code": {
"license": "MIT",
- "url": "https://github.com/meatballs/xontrib-thefuck",
+ "url": "https://github.com/Siecje/xontrib-prompt-ret-code",
"install": {
- "pip": "xpip install xontrib-thefuck"
+ "pip": "xpip install xontrib-prompt-ret-code"
}
},
"xontrib-prompt-vi-mode": {
@@ -309,11 +318,18 @@
"pip": "xpip install xontrib-prompt-vi-mode"
}
},
- "xontrib-fzf-widgets": {
- "license": "GPLv3",
- "url": "https://github.com/shahinism/xontrib-fzf-widgets",
+ "xontrib-powerline": {
+ "license": "MIT",
+ "url": "https://github.com/santagada/xontrib-powerline",
"install": {
- "pip": "xpip install xontrib-fzf-widgets"
+ "pip": "xpip install xontrib-powerline"
+ }
+ },
+ "xontrib-readable-traceback": {
+ "license": "MIT",
+ "url": "https://github.com/6syun9/xontrib-readable-traceback",
+ "install": {
+ "pip": "xpip install xontrib-readable-traceback"
}
},
"xontrib-schedule": {
@@ -322,6 +338,27 @@
"install": {
"pip": "xpip install xontrib-schedule"
}
+ },
+ "xontrib-ssh-agent": {
+ "license": "MIT",
+ "url": "https://bitbucket.org/dyuri/xontrib-ssh-agent",
+ "install": {
+ "pip": "xpip install xontrib-ssh-agent"
+ }
+ },
+ "xontrib-thefuck": {
+ "license": "MIT",
+ "url": "https://github.com/meatballs/xontrib-thefuck",
+ "install": {
+ "pip": "xpip install xontrib-thefuck"
+ }
+ },
+ "xontrib-z": {
+ "license": "GPLv3",
+ "url": "https://github.com/astronouth7303/xontrib-z",
+ "install": {
+ "pip": "xpip install xontrib-z"
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xonsh/xontribs.py new/xonsh-0.9.7/xonsh/xontribs.py
--- old/xonsh-0.9.5/xonsh/xontribs.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xonsh/xontribs.py 2019-06-28 23:30:35.000000000 +0200
@@ -11,11 +11,6 @@
from xonsh.tools import print_color, unthreadable
-(a)functools.lru_cache(1)
-def xontribs_json():
- return os.path.join(os.path.dirname(__file__), "xontribs.json")
-
-
def find_xontrib(name):
"""Finds a xontribution from its name."""
if name.startswith("."):
@@ -76,8 +71,38 @@
@functools.lru_cache()
def xontrib_metadata():
"""Loads and returns the xontribs.json file."""
- with open(xontribs_json(), "r") as f:
- md = json.load(f)
+ impres = None
+ pkg_resources = None
+
+ # NOTE: Reduce all of these alternate implementations when the minimum Python
+ # is >=3.7
+ try:
+ # Python 3.7
+ import importlib.resources as impres
+ except ImportError:
+ try:
+ # Optional backport for <3.7
+ import importlib_resources as impres
+ except ImportError:
+ try:
+ # Try the slower and clunkier pkg_resources
+ # This is only available if setuptools is part of the environment
+ import pkg_resources
+ except ImportError:
+ pass
+
+ if impres:
+ with impres.open_text("xonsh", "xontribs.json") as f:
+ md = json.load(f)
+ elif pkg_resources:
+ # Despite the name, this is a bytes
+ bytesdata = pkg_resources.resource_string("xonsh", "xontribs.json")
+ md = json.loads(bytesdata.decode("utf-8"))
+ else:
+ path = os.path.join(os.path.dirname(__file__), "xontribs.json")
+ with open(path, "r") as f:
+ md = json.load(f)
+
return md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xonsh-0.9.5/xontrib/bashisms.py new/xonsh-0.9.7/xontrib/bashisms.py
--- old/xonsh-0.9.5/xontrib/bashisms.py 2019-05-31 21:51:18.000000000 +0200
+++ new/xonsh-0.9.7/xontrib/bashisms.py 2019-06-28 23:30:35.000000000 +0200
@@ -3,10 +3,6 @@
import sys
import re
-from prompt_toolkit.keys import Keys
-from prompt_toolkit.filters import Condition, EmacsInsertMode, ViInsertMode
-
-from xonsh.platform import ptk_shell_type
__all__ = ()
@@ -43,30 +39,6 @@
return re.sub(r"!([!$^*]|[\w]+)", replace_bang, cmd)
-(a)events.on_ptk_create
-def custom_keybindings(bindings, **kw):
- if ptk_shell_type() == "prompt_toolkit2":
- handler = bindings.add
-
- @Condition
- def last_command_exists():
- return len(__xonsh__.history) > 0
-
- else:
- handler = bindings.registry.add_binding
-
- @Condition
- def last_command_exists(cli):
- return len(__xonsh__.history) > 0
-
- insert_mode = ViInsertMode() | EmacsInsertMode()
-
- @handler(Keys.Escape, ".", filter=last_command_exists & insert_mode)
- def recall_last_arg(event):
- arg = __xonsh__.history[-1].cmd.split()[-1]
- event.current_buffer.insert_text(arg)
-
-
def alias(args, stdin=None):
ret = 0
1
0
Hello community,
here is the log from the commit of package network-autoconfig for openSUSE:Factory checked in at 2019-07-08 15:11:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/network-autoconfig (Old)
and /work/SRC/openSUSE:Factory/.network-autoconfig.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "network-autoconfig"
Mon Jul 8 15:11:50 2019 rev:10 rq:713855 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/network-autoconfig/network-autoconfig.changes 2014-01-14 21:47:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.network-autoconfig.new.4615/network-autoconfig.changes 2019-07-08 15:11:53.115394611 +0200
@@ -1,0 +2,12 @@
+Wed May 1 12:55:25 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Replace old $RPM_* shell vars.
+- Remove redundant %clean section.
+
+-------------------------------------------------------------------
+Thu Mar 21 15:52:48 UTC 2019 - josef.moellers(a)suse.com
+
+- Add systemd support
+ [bsc#1116057, network-autoconfig.service, boot.network-autoconfig]
+
+-------------------------------------------------------------------
Old:
----
boot.network-autoconfig
New:
----
network-autoconfig.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ network-autoconfig.spec ++++++
--- /var/tmp/diff_new_pack.QaRROL/_old 2019-07-08 15:11:56.731398081 +0200
+++ /var/tmp/diff_new_pack.QaRROL/_new 2019-07-08 15:11:56.751398100 +0200
@@ -22,7 +22,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: wicked
-Requires(pre): %insserv_prereq
+Requires: /bin/bash
+BuildRequires: systemd-rpm-macros
+%{?systemd_requires}
Summary: Find a connected eth interface and create an ifcfg for it
License: MIT
Group: System/Boot
@@ -30,7 +32,7 @@
Source0: README
Source1: network-autoconfig
-Source2: boot.network-autoconfig
+Source2: network-autoconfig.service
%description
All available Ethernet network interfaces will be cycled
@@ -46,22 +48,31 @@
%install
# install it to a directory where autoyast will run it once
-SBINDIR=$RPM_BUILD_ROOT/usr/sbin
-INITDIR=$RPM_BUILD_ROOT/etc/init.d
-mkdir -p $SBINDIR $INITDIR
+SBINDIR=%{buildroot}/%{_sbindir}
+mkdir -p $SBINDIR
install %{SOURCE1} $SBINDIR
-install %{SOURCE2} $INITDIR
+install -d %{buildroot}/%{_unitdir}
+install %{SOURCE2} %{buildroot}/%{_unitdir}
+install -d %{buildroot}/etc/systemd/system/network-pre.target.wants
+ln -s %{_unitdir}/network-autoconfig.service %{buildroot}/etc/systemd/system/network-pre.target.wants
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%pre
+%service_add_pre network-autoconfig.service
%post
-%{fillup_and_insserv boot.network-autoconfig}
+%service_add_post network-autoconfig.service
+
+%preun
+%service_del_preun network-autoconfig.service
+
+%postun
+%service_del_postun network-autoconfig.service
%files
%defattr(-,root,root)
%doc README
-/etc/init.d/boot.network-autoconfig
+%{_unitdir}/network-autoconfig.service
/usr/sbin/network-autoconfig
+/etc/systemd
%changelog
++++++ network-autoconfig.service ++++++
[Unit]
Description=Find a connected eth interface and create an ifcfg for it
[Service]
ExecStart=/bin/bash -c "/usr/sbin/network-autoconfig >> /var/log/network-autoconfig 2>&1"
ExecStartPost=/usr/bin/systemctl disable network-autoconfig
[Install]
WantedBy=network-pre.target
1
0