openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- 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
November 2018
- 1 participants
- 1606 discussions
Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2018-11-02 10:50:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Fri Nov 2 10:50:37 2018 rev:39 rq:645244 version:2.45.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2018-09-11 17:09:58.440089726 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2018-11-02 10:50:50.998280801 +0100
@@ -1,0 +2,12 @@
+Mon Oct 29 06:00:36 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- New way of handling emblems with theming support (boo#1109382)
+- 2.45.22
+
+-------------------------------------------------------------------
+Wed Oct 24 12:43:08 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Remove the RPM Groups view (FATE#326485).
+- 2.45.21
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.45.20.tar.bz2
New:
----
libyui-qt-pkg-2.45.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.zEGOOb/_old 2018-11-02 10:50:53.634280491 +0100
+++ /var/tmp/diff_new_pack.zEGOOb/_new 2018-11-02 10:50:53.666280487 +0100
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.45.20
+Version: 2.45.22
Release: 0
Source: %{parent}-%{version}.tar.bz2
@@ -36,7 +36,7 @@
Url: http://github.com/libyui/
Summary: Libyui-qt-pkg documentation
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: Documentation/HTML
%description
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.zEGOOb/_old 2018-11-02 10:50:53.894280460 +0100
+++ /var/tmp/diff_new_pack.zEGOOb/_new 2018-11-02 10:50:53.898280460 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt-pkg
-Version: 2.45.20
+Version: 2.45.22
Release: 0
Source: %{name}-%{version}.tar.bz2
@@ -44,7 +44,7 @@
Url: http://github.com/libyui/
Summary: Libyui - Qt Package Selector
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/Libraries
%description
@@ -147,8 +147,8 @@
%{_libdir}/yui/lib*.so.*
%doc %dir %{_docdir}/%{bin_name}
%license %{_docdir}/%{bin_name}/COPYING*
-%dir %{_prefix}/share/YaST2
-%{_prefix}/share/YaST2/images
+%dir %{_prefix}/share/icons
+%{_prefix}/share/icons/hicolor
%files devel
%defattr(-,root,root)
++++++ libyui-qt-pkg-2.45.20.tar.bz2 -> libyui-qt-pkg-2.45.22.tar.bz2 ++++++
++++ 5160 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libyui-ncurses-pkg for openSUSE:Factory checked in at 2018-11-02 10:50:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg"
Fri Nov 2 10:50:01 2018 rev:33 rq:644601 version:2.48.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes 2018-09-11 17:09:45.744109508 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes 2018-11-02 10:50:08.978285740 +0100
@@ -1,0 +2,6 @@
+Wed Oct 24 12:58:23 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Remove the RPM Groups view (FATE#326485).
+- 2.48.9
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-pkg-2.48.8.tar.bz2
New:
----
libyui-ncurses-pkg-2.48.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.SEQOtO/_old 2018-11-02 10:50:10.578285552 +0100
+++ /var/tmp/diff_new_pack.SEQOtO/_new 2018-11-02 10:50:10.578285552 +0100
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.48.8
+Version: 2.48.9
Release: 0
Source: %{parent}-%{version}.tar.bz2
@@ -36,7 +36,7 @@
Url: http://github.com/libyui/
Summary: Libyui-ncurses-pkg documentation
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: Documentation/HTML
%description
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.SEQOtO/_old 2018-11-02 10:50:10.594285550 +0100
+++ /var/tmp/diff_new_pack.SEQOtO/_new 2018-11-02 10:50:10.594285550 +0100
@@ -17,7 +17,7 @@
Name: libyui-ncurses-pkg
-Version: 2.48.8
+Version: 2.48.9
Release: 0
Source: %{name}-%{version}.tar.bz2
@@ -41,7 +41,7 @@
Url: http://github.com/libyui/
Summary: Libyui - yast2 package selector widget for the ncurses UI
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/Libraries
%description
++++++ libyui-ncurses-pkg-2.48.8.tar.bz2 -> libyui-ncurses-pkg-2.48.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/SOURCECONF.cmake new/libyui-ncurses-pkg-2.48.9/SOURCECONF.cmake
--- old/libyui-ncurses-pkg-2.48.8/SOURCECONF.cmake 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/SOURCECONF.cmake 2018-10-24 16:30:34.000000000 +0200
@@ -7,7 +7,6 @@
NCPkgFilterLocale.cc
NCPkgFilterMain.cc
NCPkgFilterPattern.cc
- NCPkgFilterRPMGroups.cc
NCPkgFilterRepo.cc
NCPkgFilterService.cc
NCPkgFilterSearch.cc
@@ -40,7 +39,6 @@
NCPkgFilterLocale.h
NCPkgFilterMain.h
NCPkgFilterPattern.h
- NCPkgFilterRPMGroups.h
NCPkgFilterRepo.h
NCPkgFilterService.h
NCPkgFilterSearch.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/VERSION.cmake new/libyui-ncurses-pkg-2.48.9/VERSION.cmake
--- old/libyui-ncurses-pkg-2.48.8/VERSION.cmake 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/VERSION.cmake 2018-10-24 16:30:34.000000000 +0200
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "48" )
-SET( VERSION_PATCH "8" )
+SET( VERSION_PATCH "9" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg-doc.spec new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg-doc.spec
--- old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg-doc.spec 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg-doc.spec 2018-10-24 16:30:34.000000000 +0200
@@ -19,7 +19,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.48.8
+Version: 2.48.9
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg.changes new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg.changes
--- old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg.changes 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg.changes 2018-10-24 16:30:34.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Oct 24 12:58:23 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Remove the RPM Groups view (FATE#326485).
+- 2.48.9
+
+-------------------------------------------------------------------
Tue Aug 21 09:49:14 CEST 2018 - schubi(a)suse.de
- Changed dir of COPYING file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg.spec new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg.spec
--- old/libyui-ncurses-pkg-2.48.8/package/libyui-ncurses-pkg.spec 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/package/libyui-ncurses-pkg.spec 2018-10-24 16:30:34.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-ncurses-pkg
-Version: 2.48.8
+Version: 2.48.9
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/src/NCPackageSelector.cc new/libyui-ncurses-pkg-2.48.9/src/NCPackageSelector.cc
--- old/libyui-ncurses-pkg-2.48.8/src/NCPackageSelector.cc 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/src/NCPackageSelector.cc 2018-10-24 16:30:34.000000000 +0200
@@ -46,7 +46,6 @@
#include "NCSpacing.h"
#include "NCRichText.h"
#include "NCLabel.h"
-#include "NCPkgFilterRPMGroups.h"
#include "NCPopupInfo.h"
#include "NCSelectionBox.h"
#include "NCMenuButton.h"
@@ -109,8 +108,7 @@
// Constructor
//
NCPackageSelector::NCPackageSelector( long modeFlags )
- : filterPopup( 0 )
- , depsPopup( 0 )
+ : depsPopup( 0 )
, patternPopup( 0 )
, languagePopup( 0 )
, repoPopup( 0 )
@@ -479,10 +477,6 @@
{
retVal = CancelHandler( event );
}
- else if ( event.widget == filterPopup )
- {
- retVal = filterPopup->handleEvent();
- }
else if ( event.widget == filterMain )
{
retVal = filterMain->handleEvent();
@@ -1023,7 +1017,6 @@
delete replaceChild;
- filterPopup = 0;
patternPopup = 0;
languagePopup = 0;
repoPopup = 0;
@@ -1077,26 +1070,6 @@
servicePopup->setKeyboardFocus();
break;
}
- case RPMGroups:
- {
- filterPopup = new NCPkgFilterRPMGroups ( replPoint, " ", this);
- filterPopup->setSize( oldSize.Sze.W, oldSize.Sze.H );
- filterPopup->Redraw();
-
- YStringTreeItem * defaultGroup = filterPopup->getDefaultRpmGroup();
-
- if ( defaultGroup )
- {
- yuiMilestone() << "default RPM group: " << defaultGroup->value().translation() << endl;
- filterPopup->showRPMGroupPackages ( defaultGroup->value().translation(), defaultGroup );
- }
- else
- {
- yuiError() << "No default RPM group available" << endl;
- }
- filterPopup->setKeyboardFocus();
- break;
- }
case Search:
{
searchPopup = new NCPkgFilterSearch( replPoint, YD_VERT, this );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/src/NCPackageSelector.h new/libyui-ncurses-pkg-2.48.9/src/NCPackageSelector.h
--- old/libyui-ncurses-pkg-2.48.8/src/NCPackageSelector.h 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/src/NCPackageSelector.h 2018-10-24 16:30:34.000000000 +0200
@@ -60,7 +60,6 @@
#include <zypp/ui/Selectable.h>
#include <zypp/Patch.h>
-#include "NCPkgFilterRPMGroups.h"
#include "NCPkgFilterSearch.h"
#include "NCPkgFilterInstSummary.h"
#include "NCPkgTable.h"
@@ -80,7 +79,6 @@
class LangCode;
class NCPkgPopupDeps;
class NCPkgDiskspace;
-class NCPkgFilterRPMGroups;
class NCPkgFilterSearch;
class NCPkgFilterInstSummary;
class NCPkgFilterClassification;
@@ -130,8 +128,6 @@
tHandlerMap eventHandlerMap; // event handler map
- NCPkgFilterRPMGroups * filterPopup; // the rpm group tags popup
-
NCPkgPopupDeps * depsPopup; // the package dependeny popup
NCPkgFilterPattern * patternPopup; // the pattern popup
@@ -213,7 +209,6 @@
Languages,
Repositories,
Services,
- RPMGroups,
Search,
Summary,
PkgClassification
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterMain.cc new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterMain.cc
--- old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterMain.cc 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterMain.cc 2018-10-24 16:30:34.000000000 +0200
@@ -72,9 +72,6 @@
languages = new YItem( _( "Languages" ) );
items.push_back( languages );
- rpmgroups = new YItem( _( "RPM Groups" ) );
- items.push_back( rpmgroups );
-
repositories = new YItem( _( "Repositories" ) );
items.push_back( repositories );
@@ -103,9 +100,7 @@
YItem *currentItem = selectedItem();
- if ( currentItem == rpmgroups )
- pkg->replaceFilter ( NCPackageSelector::RPMGroups );
- else if ( currentItem == patterns )
+ if ( currentItem == patterns )
pkg->replaceFilter ( NCPackageSelector::Patterns );
else if ( currentItem == languages )
pkg->replaceFilter ( NCPackageSelector::Languages );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterRPMGroups.cc new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterRPMGroups.cc
--- old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterRPMGroups.cc 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterRPMGroups.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,366 +0,0 @@
-/****************************************************************************
-|
-| Copyright (c) [2002-2011] Novell, Inc.
-| All Rights Reserved.
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of version 2 of the GNU General Public License as
-| published by the Free Software Foundation.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, contact Novell, Inc.
-|
-| To contact Novell about this file by physical or electronic mail,
-| you may find current contact information at www.novell.com
-|
-|***************************************************************************/
-
-
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: NCPkgFilterRPMGroups.cc
-
- Author: Gabriele Strattner <gs(a)suse.de>
-
-/-*/
-#define YUILogComponent "ncurses-pkg"
-#include <YUILog.h>
-
-#include "NCPkgFilterRPMGroups.h"
-
-#include "NCTree.h"
-#include "YMenuButton.h"
-#include "YDialog.h"
-#include "YTreeItem.h"
-#include "NCLayoutBox.h"
-#include "NCPkgStrings.h"
-#include "NCPackageSelector.h"
-
-#include "NCZypp.h"
-
-using std::endl;
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// CLASS NAME : NCRpmGroupItem
-//
-// DESCRIPTION : class derived from YTreeItem with additional
-// property to store the original rpm group item
-//
-//
-class NCRpmGroupItem : public YTreeItem {
-
-private:
- YStringTreeItem * rpmGroupItem;
-
-public:
-
- NCRpmGroupItem( YTreeItem * parent,
- const std::string & label,
- YStringTreeItem * origItem )
- : YTreeItem( parent, label ),
- rpmGroupItem( origItem )
- {
-
- }
-
- NCRpmGroupItem( const std::string & label,
- YStringTreeItem * origItem )
- : YTreeItem( label ),
- rpmGroupItem( origItem )
- {
-
- }
-
- YStringTreeItem * getOrigItem() const { return rpmGroupItem; }
-
-};
-
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : NCPkgFilterRPMGroups::NCPkgFilterRPMGroups
-// METHOD TYPE : Constructor
-//
-// DESCRIPTION :
-//
-
-NCPkgFilterRPMGroups::NCPkgFilterRPMGroups( YWidget *parent, std::string label, NCPackageSelector * pkg )
- : NCTree( parent, label )
- , filterTree( this )
- , packager ( pkg )
- , _rpmGroupsTree (0)
-{
- // create the layout (the NCTree)
- setNotify(true);
-
- _rpmGroupsTree = new YRpmGroupsTree ();
-
- ZyppPoolIterator b = zyppPkgBegin ();
- ZyppPoolIterator e = zyppPkgEnd ();
- ZyppPoolIterator i;
-
- for ( i = b; i != e; ++i )
- {
- ZyppPkg zyppPkg = tryCastToZyppPkg( (*i)->theObj() );
- if ( zyppPkg )
- {
- _rpmGroupsTree->addRpmGroup (zyppPkg->group ());
- yuiDebug() << "Adding group: " << zyppPkg->group() << endl;
- }
- }
-
- if (_rpmGroupsTree )
- {
- // clone the tree (fill the NCTree)
- cloneTree( _rpmGroupsTree->root(), 0 );
- }
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : NCPkgFilterRPMGroups::~NCPkgFilterRPMGroups
-// METHOD TYPE : Destructor
-//
-// DESCRIPTION :
-//
-NCPkgFilterRPMGroups::~NCPkgFilterRPMGroups()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : NCPkgFilterRPMGroups::showFilterPopup
-// METHOD TYPE : void
-//
-// DESCRIPTION :
-//
-bool NCPkgFilterRPMGroups::handleEvent( )
-{
-
- YStringTreeItem * origItem;
- const YTreeItem * item = filterTree->getCurrentItem();
-
- if ( item )
- {
- const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item);
-
- if ( rpmGroupItem )
- {
- // get the original rpm group item (YStringTreeItem)
- origItem = rpmGroupItem->getOrigItem();
-
- if ( origItem )
- {
- std::string label = origItem->value().translation();
-
- // fill the package list
- showRPMGroupPackages( label, origItem );
-
- yuiMilestone() << "Selected RPM group: " << label << endl;
- }
- }
- }
- else
- {
- yuiError() << "Current item not valid" << endl;
- }
-
- return true;
-}
-
-YStringTreeItem * NCPkgFilterRPMGroups::getDefaultRpmGroup()
-{
- if ( _rpmGroupsTree &&
- _rpmGroupsTree->root() )
- return _rpmGroupsTree->root()->firstChild();
- else
- return 0;
-}
-
-
-bool NCPkgFilterRPMGroups::checkPackage( ZyppObj opkg, ZyppSel slb,
- YStringTreeItem * rpmGroup )
-{
- ZyppPkg pkg = tryCastToZyppPkg (opkg);
- if ( ! pkg || ! rpmGroup )
- return false;
-
- NCPkgTable * packageList = packager->PackageList();
-
- if ( !packageList )
- {
- yuiError() << "Widget is not a valid NCPkgTable widget" << endl;
- return false;
- }
-
- std::string group_str = _rpmGroupsTree->rpmGroup (rpmGroup);
- yuiDebug() << group_str << endl;
- // is the requested rpm group a prefix of this package's group?
- if ( pkg->group ().find (group_str) == 0 )
- {
- yuiDebug() << slb->name() << endl;
- packageList->createListEntry( pkg, slb );
-
- return true;
- }
- else
- {
- return false;
- }
-}
-
-bool NCPkgFilterRPMGroups::showRPMGroupPackages ( const std::string & label, YStringTreeItem *rpmGroup )
-{
- NCPkgTable * packageList = packager->PackageList();
-
- if ( !packageList )
- {
- yuiError() << "No valid NCPkgTable widget" << endl;
- return false;
- }
-
- // clear the package table
- packageList->itemsCleared ();
-
- // get the package list and sort it
- std::list<ZyppSel> pkgList( zyppPkgBegin (), zyppPkgEnd () );
-
- // fill the package table
- std::list<ZyppSel>::iterator listIt;
- ZyppPkg pkgPtr;
-
-
- for ( listIt = pkgList.begin(); listIt != pkgList.end(); ++listIt )
- {
- ZyppSel selectable = *listIt;
-
- // Multiple instances of this package may or may not be in the same
- // RPM group, so let's check both the installed version (if there
- // is any) and the candidate version.
- //
- // Make sure we emit only one filterMatch() signal if both exist
- // and both are in the same RPM group. We don't want multiple list
- // entries for the same package!
-
- bool match =
- checkPackage( selectable->candidateObj(), selectable, rpmGroup ) ||
- checkPackage( selectable->installedObj(), selectable, rpmGroup );
-
- // If there is neither an installed nor a candidate package, check
- // any other instance.
-
- if ( ! match &&
- ! selectable->installedObj() &&
- ! selectable->candidateObj() )
- checkPackage( selectable->theObj(), selectable, rpmGroup );
-
- }
-
- // show the package list
- packageList->setCurrentItem( 0 );
- packageList->drawList();
- packageList->showInformation();
-
- yuiMilestone() << "Filling package list" << endl;
-
- if ( ! label.empty() )
- {
- YLabel *packageLabel = packager->PackageLabel();
- // show the selected filter label
- if ( packageLabel )
- {
- packageLabel->setText( label );
- }
- }
-
- return true;
-
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : NCPkgFilterRPMGroups::addItem
-// METHOD TYPE : void
-//
-// DESCRIPTION :
-//
-void NCPkgFilterRPMGroups::addItem( YTreeItem * newItem )
-{
- if ( !filterTree )
- {
- yuiError() << "ERROR: rpm groups tree not available" << endl;
- return;
- }
-
- filterTree->addItem( newItem );
-
-}
-
-/////////////////////////////////////////////////////////////////////
-////
-////
-//// METHOD NAME : NCPopup::wHandleInput
-//// METHOD TYPE : NCursesEvent
-////
-//// DESCRIPTION :
-////
-NCursesEvent NCPkgFilterRPMGroups::wHandleInput( wint_t ch )
-{
- return NCTree::wHandleInput( ch );
-}
-
-///////////////////////////////////////////////////////////////////
-//
-// cloneTree
-//
-// Adds all tree items got from YPkgRpmGroupTagsFilterView to
-// the filter popup tree
-//
-void NCPkgFilterRPMGroups::cloneTree( YStringTreeItem * parentOrig, NCRpmGroupItem * parentClone )
-{
- YStringTreeItem * child = parentOrig->firstChild();
- NCRpmGroupItem * clone;
-
- while ( child )
- {
- yuiDebug() << "Rpm group (translated): " << child->value().translation() << endl;
-
- if ( parentClone )
- {
- // YTreeItems which have a parent will automatically register
- // this item with the parent item.
- clone = new NCRpmGroupItem( parentClone, child->value().translation(), child );
- }
- else
- {
- clone = new NCRpmGroupItem( child->value().translation(), child );
- // use addItem() only for the toplevel items
- addItem( clone );
- }
-
- cloneTree( child, clone );
- child = child->next();
- }
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterRPMGroups.h new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterRPMGroups.h
--- old/libyui-ncurses-pkg-2.48.8/src/NCPkgFilterRPMGroups.h 2018-08-22 09:39:28.000000000 +0200
+++ new/libyui-ncurses-pkg-2.48.9/src/NCPkgFilterRPMGroups.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-/****************************************************************************
-|
-| Copyright (c) [2002-2011] Novell, Inc.
-| All Rights Reserved.
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of version 2 of the GNU General Public License as
-| published by the Free Software Foundation.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, contact Novell, Inc.
-|
-| To contact Novell about this file by physical or electronic mail,
-| you may find current contact information at www.novell.com
-|
-|***************************************************************************/
-
-
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: NCPkgFilterRPMGroups.h
-
- Author: Gabriele Strattner <gs(a)suse.de>
-
-/-*/
-#ifndef NCPkgFilterRPMGroups_h
-#define NCPkgFilterRPMGroups_h
-
-#include <iosfwd>
-
-#include <vector>
-#include <string>
-
-#include "NCPopup.h"
-#include "NCTree.h"
-#include "NCLabel.h"
-#include "NCRichText.h"
-#include "NCZypp.h"
-
-#include <YRpmGroupsTree.h>
-
-class NCTree;
-class NCPackageSelector;
-class NCRpmGroupItem;
-
-///////////////////////////////////////////////////////////////////
-//
-// CLASS NAME : NCPkgFilterRPMGroups
-//
-// DESCRIPTION :
-//
-class NCPkgFilterRPMGroups : public NCTree {
-
- NCPkgFilterRPMGroups & operator=( const NCPkgFilterRPMGroups & );
- NCPkgFilterRPMGroups ( const NCPkgFilterRPMGroups & );
-
-private:
-
- NCTree * filterTree; // the YTree
-
- NCPackageSelector * packager; // connection to the PackageSelector
-
- YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages
-
- // internal use (copies tree items)
- void cloneTree( YStringTreeItem * parentOrig, NCRpmGroupItem * parentClone );
-
-protected:
-
- void setCurrentItem( int index );
-
- virtual NCursesEvent wHandleInput( wint_t ch );
-
-public:
-
- NCPkgFilterRPMGroups( YWidget *parent, std::string label, NCPackageSelector * packager );
- virtual ~NCPkgFilterRPMGroups();
-
- bool handleEvent();
-
- YStringTreeItem * getDefaultRpmGroup();
-
- bool checkPackage( ZyppObj opkg, ZyppSel slb, YStringTreeItem *rpmGroup);
-
- bool showRPMGroupPackages ( const std::string & label, YStringTreeItem *rpmGroup );
-
- void addItem( YTreeItem * newItem );
-
-};
-
-///////////////////////////////////////////////////////////////////
-
-
-#endif // NCPkgFilterRPMGroups_h
1
0
Hello community,
here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2018-11-02 10:49:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt"
Fri Nov 2 10:49:19 2018 rev:52 rq:644600 version:2.49.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2018-09-11 17:09:48.708104889 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2018-11-02 10:49:39.682289175 +0100
@@ -1,0 +2,12 @@
+Sat Oct 13 00:36:14 UTC 2018 - Stasiek Michalski <hellcp(a)opensuse.org>
+
+- Fix style disappearing from sidebar (boo#1111720)
+- 2.49.7
+
+-------------------------------------------------------------------
+Wed Sep 19 16:02:51 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Enable HiDPI (bsc#1089886)
+- 2.49.6
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-2.49.5.tar.bz2
New:
----
libyui-qt-2.49.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-doc.spec ++++++
--- /var/tmp/diff_new_pack.2O1aio/_old 2018-11-02 10:49:41.570288954 +0100
+++ /var/tmp/diff_new_pack.2O1aio/_new 2018-11-02 10:49:41.578288953 +0100
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.49.5
+Version: 2.49.7
Release: 0
Source: %{parent}-%{version}.tar.bz2
@@ -36,7 +36,7 @@
Url: http://github.com/libyui/
Summary: Libyui-qt documentation
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: Documentation/HTML
%description
++++++ libyui-qt.spec ++++++
--- /var/tmp/diff_new_pack.2O1aio/_old 2018-11-02 10:49:41.594288951 +0100
+++ /var/tmp/diff_new_pack.2O1aio/_new 2018-11-02 10:49:41.598288950 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.49.5
+Version: 2.49.7
Release: 0
Source: %{name}-%{version}.tar.bz2
@@ -42,7 +42,7 @@
Url: http://github.com/libyui/
Summary: Libyui - Qt User Interface
-License: LGPL-2.1 or LGPL-3.0
+License: LGPL-2.1-only OR LGPL-3.0-only
Group: System/Libraries
%description
++++++ libyui-qt-2.49.5.tar.bz2 -> libyui-qt-2.49.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/VERSION.cmake new/libyui-qt-2.49.7/VERSION.cmake
--- old/libyui-qt-2.49.5/VERSION.cmake 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/VERSION.cmake 2018-10-16 14:04:32.000000000 +0200
@@ -1,6 +1,6 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "49")
-SET(VERSION_PATCH "5")
+SET(VERSION_PATCH "7")
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is needed for the libyui-qt core ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/package/libyui-qt-doc.spec new/libyui-qt-2.49.7/package/libyui-qt-doc.spec
--- old/libyui-qt-2.49.5/package/libyui-qt-doc.spec 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/package/libyui-qt-doc.spec 2018-10-16 14:04:32.000000000 +0200
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.49.5
+Version: 2.49.7
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/package/libyui-qt.changes new/libyui-qt-2.49.7/package/libyui-qt.changes
--- old/libyui-qt-2.49.5/package/libyui-qt.changes 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/package/libyui-qt.changes 2018-10-16 14:04:32.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Sat Oct 13 00:36:14 UTC 2018 - Stasiek Michalski <hellcp(a)opensuse.org>
+
+- Fix style disappearing from sidebar (boo#1111720)
+- 2.49.7
+
+-------------------------------------------------------------------
+Wed Sep 19 16:02:51 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Enable HiDPI (bsc#1089886)
+- 2.49.6
+
+-------------------------------------------------------------------
Tue Aug 21 09:05:54 CEST 2018 - schubi(a)suse.de
- Changed dir of COPYING file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/package/libyui-qt.spec new/libyui-qt-2.49.7/package/libyui-qt.spec
--- old/libyui-qt-2.49.5/package/libyui-qt.spec 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/package/libyui-qt.spec 2018-10-16 14:04:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.49.5
+Version: 2.49.7
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2CharValidator.cc new/libyui-qt-2.49.7/src/QY2CharValidator.cc
--- old/libyui-qt-2.49.5/src/QY2CharValidator.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2CharValidator.cc 2018-10-16 14:04:32.000000000 +0200
@@ -69,4 +69,4 @@
}
-#include "QY2CharValidator.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2ComboTabWidget.cc new/libyui-qt-2.49.7/src/QY2ComboTabWidget.cc
--- old/libyui-qt-2.49.5/src/QY2ComboTabWidget.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2ComboTabWidget.cc 2018-10-16 14:04:32.000000000 +0200
@@ -153,4 +153,4 @@
-#include "QY2ComboTabWidget.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2DiskUsageList.cc new/libyui-qt-2.49.7/src/QY2DiskUsageList.cc
--- old/libyui-qt-2.49.5/src/QY2DiskUsageList.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2DiskUsageList.cc 2018-10-16 14:04:32.000000000 +0200
@@ -379,4 +379,4 @@
}
}
-#include "QY2DiskUsageList.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2HelpDialog.cc new/libyui-qt-2.49.7/src/QY2HelpDialog.cc
--- old/libyui-qt-2.49.5/src/QY2HelpDialog.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2HelpDialog.cc 2018-10-16 14:04:32.000000000 +0200
@@ -136,4 +136,4 @@
-#include "QY2HelpDialog.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2ListView.cc new/libyui-qt-2.49.7/src/QY2ListView.cc
--- old/libyui-qt-2.49.5/src/QY2ListView.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2ListView.cc 2018-10-16 14:04:32.000000000 +0200
@@ -540,4 +540,4 @@
-#include "QY2ListView.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2RelNotesDialog.cc new/libyui-qt-2.49.7/src/QY2RelNotesDialog.cc
--- old/libyui-qt-2.49.5/src/QY2RelNotesDialog.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2RelNotesDialog.cc 2018-10-16 14:04:32.000000000 +0200
@@ -136,4 +136,4 @@
-#include "QY2RelNotesDialog.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2StyleEditor.cc new/libyui-qt-2.49.7/src/QY2StyleEditor.cc
--- old/libyui-qt-2.49.5/src/QY2StyleEditor.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2StyleEditor.cc 2018-10-16 14:04:32.000000000 +0200
@@ -109,4 +109,4 @@
-#include "QY2StyleEditor.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/QY2Styler.cc new/libyui-qt-2.49.7/src/QY2Styler.cc
--- old/libyui-qt-2.49.5/src/QY2Styler.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/QY2Styler.cc 2018-10-16 14:04:32.000000000 +0200
@@ -27,7 +27,7 @@
#include <yui/YUILog.h>
#include <yui/YUIException.h>
#include <yui/Libyui_config.h>
-#include <YSettings.h>
+#include <yui/YSettings.h>
#include "QY2Styler.h"
#include <QDebug>
@@ -509,4 +509,4 @@
}
-#include "QY2Styler.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQAlignment.cc new/libyui-qt-2.49.7/src/YQAlignment.cc
--- old/libyui-qt-2.49.5/src/YQAlignment.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQAlignment.cc 2018-10-16 14:04:32.000000000 +0200
@@ -91,4 +91,4 @@
this->update();
}
-#include "YQAlignment.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQApplication.cc new/libyui-qt-2.49.7/src/YQApplication.cc
--- old/libyui-qt-2.49.5/src/YQApplication.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQApplication.cc 2018-10-16 14:04:32.000000000 +0200
@@ -786,4 +786,4 @@
}
}
-#include "YQApplication.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQBarGraph.cc new/libyui-qt-2.49.7/src/YQBarGraph.cc
--- old/libyui-qt-2.49.5/src/YQBarGraph.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQBarGraph.cc 2018-10-16 14:04:32.000000000 +0200
@@ -340,4 +340,4 @@
-#include "YQBarGraph.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQBusyIndicator.cc new/libyui-qt-2.49.7/src/YQBusyIndicator.cc
--- old/libyui-qt-2.49.5/src/YQBusyIndicator.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQBusyIndicator.cc 2018-10-16 14:04:32.000000000 +0200
@@ -227,4 +227,4 @@
}
-#include "YQBusyIndicator.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQButtonBox.cc new/libyui-qt-2.49.7/src/YQButtonBox.cc
--- old/libyui-qt-2.49.5/src/YQButtonBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQButtonBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -63,4 +63,4 @@
}
-#include "YQButtonBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQCheckBox.cc new/libyui-qt-2.49.7/src/YQCheckBox.cc
--- old/libyui-qt-2.49.5/src/YQCheckBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQCheckBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -155,4 +155,4 @@
}
-#include "YQCheckBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQCheckBoxFrame.cc new/libyui-qt-2.49.7/src/YQCheckBoxFrame.cc
--- old/libyui-qt-2.49.5/src/YQCheckBoxFrame.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQCheckBoxFrame.cc 2018-10-16 14:04:32.000000000 +0200
@@ -194,4 +194,4 @@
-#include "YQCheckBoxFrame.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQComboBox.cc new/libyui-qt-2.49.7/src/YQComboBox.cc
--- old/libyui-qt-2.49.5/src/YQComboBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQComboBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -265,4 +265,4 @@
}
-#include "YQComboBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQContextMenu.cc new/libyui-qt-2.49.7/src/YQContextMenu.cc
--- old/libyui-qt-2.49.5/src/YQContextMenu.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQContextMenu.cc 2018-10-16 14:04:32.000000000 +0200
@@ -212,4 +212,4 @@
}
-#include "YQContextMenu.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQDateField.cc new/libyui-qt-2.49.7/src/YQDateField.cc
--- old/libyui-qt-2.49.5/src/YQDateField.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQDateField.cc 2018-10-16 14:04:32.000000000 +0200
@@ -32,7 +32,7 @@
#include "utf8.h"
#include "YQUI.h"
#include "YQDateField.h"
-#include "YEvent.h"
+#include "yui/YEvent.h"
#include "YQWidgetCaption.h"
@@ -130,4 +130,4 @@
YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) );
}
-#include "YQDateField.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQDialog.cc new/libyui-qt-2.49.7/src/YQDialog.cc
--- old/libyui-qt-2.49.5/src/YQDialog.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQDialog.cc 2018-10-16 14:04:32.000000000 +0200
@@ -41,7 +41,7 @@
#include "YQWizard.h"
#include "YQMainWinDock.h"
#include <yui/YDialogSpy.h>
-#include <YApplication.h>
+#include <yui/YApplication.h>
#include "QY2Styler.h"
#include "QY2StyleEditor.h"
@@ -895,4 +895,4 @@
}
-#include "YQDialog.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQDownloadProgress.cc new/libyui-qt-2.49.7/src/YQDownloadProgress.cc
--- old/libyui-qt-2.49.5/src/YQDownloadProgress.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQDownloadProgress.cc 2018-10-16 14:04:32.000000000 +0200
@@ -137,4 +137,4 @@
}
-#include "YQDownloadProgress.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQDumbTab.cc new/libyui-qt-2.49.7/src/YQDumbTab.cc
--- old/libyui-qt-2.49.5/src/YQDumbTab.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQDumbTab.cc 2018-10-16 14:04:32.000000000 +0200
@@ -235,4 +235,4 @@
-#include "YQDumbTab.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQEmpty.cc new/libyui-qt-2.49.7/src/YQEmpty.cc
--- old/libyui-qt-2.49.5/src/YQEmpty.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQEmpty.cc 2018-10-16 14:04:32.000000000 +0200
@@ -46,4 +46,4 @@
}
-#include "YQEmpty.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQFrame.cc new/libyui-qt-2.49.7/src/YQFrame.cc
--- old/libyui-qt-2.49.5/src/YQFrame.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQFrame.cc 2018-10-16 14:04:32.000000000 +0200
@@ -110,4 +110,4 @@
}
-#include "YQFrame.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQGenericButton.cc new/libyui-qt-2.49.7/src/YQGenericButton.cc
--- old/libyui-qt-2.49.5/src/YQGenericButton.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQGenericButton.cc 2018-10-16 14:04:32.000000000 +0200
@@ -238,4 +238,4 @@
_qPushButton->setShortcut (key );
}
-#include "YQGenericButton.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQImage.cc new/libyui-qt-2.49.7/src/YQImage.cc
--- old/libyui-qt-2.49.5/src/YQImage.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQImage.cc 2018-10-16 14:04:32.000000000 +0200
@@ -185,4 +185,4 @@
}
}
-#include "YQImage.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQInputField.cc new/libyui-qt-2.49.7/src/YQInputField.cc
--- old/libyui-qt-2.49.5/src/YQInputField.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQInputField.cc 2018-10-16 14:04:32.000000000 +0200
@@ -330,4 +330,4 @@
}
-#include "YQInputField.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQIntField.cc new/libyui-qt-2.49.7/src/YQIntField.cc
--- old/libyui-qt-2.49.5/src/YQIntField.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQIntField.cc 2018-10-16 14:04:32.000000000 +0200
@@ -152,4 +152,4 @@
}
-#include "YQIntField.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQLabel.cc new/libyui-qt-2.49.7/src/YQLabel.cc
--- old/libyui-qt-2.49.5/src/YQLabel.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQLabel.cc 2018-10-16 14:04:32.000000000 +0200
@@ -112,4 +112,4 @@
}
-#include "YQLabel.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQLayoutBox.cc new/libyui-qt-2.49.7/src/YQLayoutBox.cc
--- old/libyui-qt-2.49.5/src/YQLayoutBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQLayoutBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -101,4 +101,4 @@
}
-#include "YQLayoutBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQLogView.cc new/libyui-qt-2.49.7/src/YQLogView.cc
--- old/libyui-qt-2.49.5/src/YQLogView.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQLogView.cc 2018-10-16 14:04:32.000000000 +0200
@@ -185,5 +185,5 @@
-#include "YQLogView.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQMainWinDock.cc new/libyui-qt-2.49.7/src/YQMainWinDock.cc
--- old/libyui-qt-2.49.5/src/YQMainWinDock.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQMainWinDock.cc 2018-10-16 14:04:32.000000000 +0200
@@ -324,4 +324,4 @@
}
-#include "YQMainWinDock.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQMenuButton.cc new/libyui-qt-2.49.7/src/YQMenuButton.cc
--- old/libyui-qt-2.49.5/src/YQMenuButton.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQMenuButton.cc 2018-10-16 14:04:32.000000000 +0200
@@ -229,4 +229,4 @@
}
-#include "YQMenuButton.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQMultiLineEdit.cc new/libyui-qt-2.49.7/src/YQMultiLineEdit.cc
--- old/libyui-qt-2.49.5/src/YQMultiLineEdit.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQMultiLineEdit.cc 2018-10-16 14:04:32.000000000 +0200
@@ -165,5 +165,5 @@
}
-#include "YQMultiLineEdit.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQMultiProgressMeter.cc new/libyui-qt-2.49.7/src/YQMultiProgressMeter.cc
--- old/libyui-qt-2.49.5/src/YQMultiProgressMeter.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQMultiProgressMeter.cc 2018-10-16 14:04:32.000000000 +0200
@@ -339,4 +339,4 @@
}
-#include "YQMultiProgressMeter.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQMultiSelectionBox.cc new/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc
--- old/libyui-qt-2.49.5/src/YQMultiSelectionBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -366,4 +366,4 @@
*/
}
-#include "YQMultiSelectionBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQPartitionSplitter.cc new/libyui-qt-2.49.7/src/YQPartitionSplitter.cc
--- old/libyui-qt-2.49.5/src/YQPartitionSplitter.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQPartitionSplitter.cc 2018-10-16 14:04:32.000000000 +0200
@@ -207,4 +207,4 @@
}
-#include "YQPartitionSplitter.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQProgressBar.cc new/libyui-qt-2.49.7/src/YQProgressBar.cc
--- old/libyui-qt-2.49.5/src/YQProgressBar.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQProgressBar.cc 2018-10-16 14:04:32.000000000 +0200
@@ -123,4 +123,4 @@
}
-#include "YQProgressBar.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQPushButton.cc new/libyui-qt-2.49.7/src/YQPushButton.cc
--- old/libyui-qt-2.49.5/src/YQPushButton.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQPushButton.cc 2018-10-16 14:04:32.000000000 +0200
@@ -86,4 +86,4 @@
}
-#include "YQPushButton.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQRadioButton.cc new/libyui-qt-2.49.7/src/YQRadioButton.cc
--- old/libyui-qt-2.49.5/src/YQRadioButton.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQRadioButton.cc 2018-10-16 14:04:32.000000000 +0200
@@ -183,4 +183,4 @@
}
-#include "YQRadioButton.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQRadioButtonGroup.cc new/libyui-qt-2.49.7/src/YQRadioButtonGroup.cc
--- old/libyui-qt-2.49.5/src/YQRadioButtonGroup.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQRadioButtonGroup.cc 2018-10-16 14:04:32.000000000 +0200
@@ -74,4 +74,4 @@
}
-#include "YQRadioButtonGroup.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQReplacePoint.cc new/libyui-qt-2.49.7/src/YQReplacePoint.cc
--- old/libyui-qt-2.49.5/src/YQReplacePoint.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQReplacePoint.cc 2018-10-16 14:04:32.000000000 +0200
@@ -74,4 +74,4 @@
YReplacePoint::setSize( newWidth, newHeight );
}
-#include "YQReplacePoint.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQRichText.cc new/libyui-qt-2.49.7/src/YQRichText.cc
--- old/libyui-qt-2.49.5/src/YQRichText.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQRichText.cc 2018-10-16 14:04:32.000000000 +0200
@@ -231,4 +231,4 @@
-#include "YQRichText.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQSelectionBox.cc new/libyui-qt-2.49.7/src/YQSelectionBox.cc
--- old/libyui-qt-2.49.5/src/YQSelectionBox.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQSelectionBox.cc 2018-10-16 14:04:32.000000000 +0200
@@ -392,4 +392,4 @@
-#include "YQSelectionBox.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQSlider.cc new/libyui-qt-2.49.7/src/YQSlider.cc
--- old/libyui-qt-2.49.5/src/YQSlider.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQSlider.cc 2018-10-16 14:04:32.000000000 +0200
@@ -201,4 +201,4 @@
}
-#include "YQSlider.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQSpacing.cc new/libyui-qt-2.49.7/src/YQSpacing.cc
--- old/libyui-qt-2.49.5/src/YQSpacing.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQSpacing.cc 2018-10-16 14:04:32.000000000 +0200
@@ -50,4 +50,4 @@
-#include "YQSpacing.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQSquash.cc new/libyui-qt-2.49.7/src/YQSquash.cc
--- old/libyui-qt-2.49.5/src/YQSquash.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQSquash.cc 2018-10-16 14:04:32.000000000 +0200
@@ -56,4 +56,4 @@
}
-#include "YQSquash.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQTable.cc new/libyui-qt-2.49.7/src/YQTable.cc
--- old/libyui-qt-2.49.5/src/YQTable.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQTable.cc 2018-10-16 14:04:32.000000000 +0200
@@ -472,4 +472,4 @@
}
-#include "YQTable.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQTimeField.cc new/libyui-qt-2.49.7/src/YQTimeField.cc
--- old/libyui-qt-2.49.5/src/YQTimeField.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQTimeField.cc 2018-10-16 14:04:32.000000000 +0200
@@ -31,7 +31,7 @@
#include "utf8.h"
#include "YQUI.h"
#include "YQTimeField.h"
-#include "YEvent.h"
+#include "yui/YEvent.h"
#include "YQWidgetCaption.h"
#include <QVBoxLayout>
@@ -129,4 +129,4 @@
}
-#include "YQTimeField.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQTimezoneSelector.cc new/libyui-qt-2.49.7/src/YQTimezoneSelector.cc
--- old/libyui-qt-2.49.5/src/YQTimezoneSelector.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQTimezoneSelector.cc 2018-10-16 14:04:32.000000000 +0200
@@ -389,4 +389,4 @@
update( QRect( current - QPoint( 3, 3 ), QSize( 7, 7 ) ) );
}
-#include "YQTimezoneSelector.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQTree.cc new/libyui-qt-2.49.7/src/YQTree.cc
--- old/libyui-qt-2.49.5/src/YQTree.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQTree.cc 2018-10-16 14:04:32.000000000 +0200
@@ -534,4 +534,4 @@
}
-#include "YQTree.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQUI.cc new/libyui-qt-2.49.7/src/YQUI.cc
--- old/libyui-qt-2.49.5/src/YQUI.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQUI.cc 2018-10-16 14:04:32.000000000 +0200
@@ -150,6 +150,7 @@
char ** argv = cmdLine.argv();
yuiDebug() << "Creating QApplication" << std::endl;
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
new QApplication( _ui_argc, argv );
Q_CHECK_PTR( qApp );
// Qt keeps track to a global QApplication in qApp.
@@ -692,4 +693,4 @@
-#include "YQUI.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQWidgetCaption.cc new/libyui-qt-2.49.7/src/YQWidgetCaption.cc
--- old/libyui-qt-2.49.5/src/YQWidgetCaption.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQWidgetCaption.cc 2018-10-16 14:04:32.000000000 +0200
@@ -93,4 +93,4 @@
}
-#include "YQWidgetCaption.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQWizard.cc new/libyui-qt-2.49.7/src/YQWizard.cc
--- old/libyui-qt-2.49.5/src/YQWizard.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQWizard.cc 2018-10-16 14:04:32.000000000 +0200
@@ -281,9 +281,9 @@
// Steps
_stepsPanel = new QFrame( _sideBar );
_sideBar->addWidget( _stepsPanel );
- _stepsPanel->setObjectName( "steps" );
+ _sideBar->setObjectName( "steps" );
+ _sideBar->setProperty( "class", "steps" );
QY2Styler::styler()->registerChildWidget( this, _stepsPanel );
- _stepsPanel->setProperty( "class", "steps QFrame" );
_stepsDirty = true; // no layout yet
}
@@ -427,7 +427,7 @@
rbl->addWidget( (QWidget *) _releaseNotesButton->widgetRep(), 0, Qt::AlignCenter );
_stepsVBox->addLayout( rbl );
- _stepsVBox->addStretch( 29 );
+ _stepsVBox->addStretch( 1 );
_stepsDirty = false;
@@ -1476,4 +1476,4 @@
_nameLabel->style()->polish( _nameLabel );
}
-#include "YQWizard.moc"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.49.5/src/YQWizardButton.cc new/libyui-qt-2.49.7/src/YQWizardButton.cc
--- old/libyui-qt-2.49.5/src/YQWizardButton.cc 2018-08-22 09:39:06.000000000 +0200
+++ new/libyui-qt-2.49.7/src/YQWizardButton.cc 2018-10-16 14:04:32.000000000 +0200
@@ -117,4 +117,4 @@
-#include "YQWizardButton.moc"
+
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-11-02 05:33:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Fri Nov 2 05:33:34 2018 rev:637 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change
_service:product_converter:openSUSE-Addon-NonOss-release.spec: same change
_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi: same change
_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec: same change
_service:product_converter:openSUSE-cd-mini-i586.kiwi: same change
_service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change
_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi: same change
++++++ _service:product_converter:openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.UCgzJe/_old 2018-11-02 05:33:56.842206044 +0100
+++ /var/tmp/diff_new_pack.UCgzJe/_new 2018-11-02 05:33:56.858206044 +0100
@@ -17128,6 +17128,7 @@
Provides: weakremover(ruby2.5-rubygem-recursive-open-struct-testsuite)
Provides: weakremover(libdpdk-17_11-0)
Provides: weakremover(libgrpc-1_8_3)
+Provides: weakremover(markmywords)
Provides: weakremover(gtk2-immodules-tigrigna)
Provides: weakremover(hdf5_1_10_1-gnu-mpich-hpc)
Provides: weakremover(hdf5_1_10_1-gnu-mpich-hpc-devel)
@@ -34785,6 +34786,7 @@
<obsoletepackage>ruby2.5-rubygem-recursive-open-struct-testsuite</obsoletepackage>
<obsoletepackage>libdpdk-17_11-0</obsoletepackage>
<obsoletepackage>libgrpc-1_8_3</obsoletepackage>
+ <obsoletepackage>markmywords</obsoletepackage>
<obsoletepackage>gtk2-immodules-tigrigna</obsoletepackage>
<obsoletepackage>hdf5_1_10_1-gnu-mpich-hpc</obsoletepackage>
<obsoletepackage>hdf5_1_10_1-gnu-mpich-hpc-devel</obsoletepackage>
openSUSE-release.spec: same change
++++++ obsoletepackages.inc ++++++
--- /var/tmp/diff_new_pack.UCgzJe/_old 2018-11-02 05:33:57.118206042 +0100
+++ /var/tmp/diff_new_pack.UCgzJe/_new 2018-11-02 05:33:57.122206042 +0100
@@ -17058,6 +17058,7 @@
<!-- Factory/openSUSE_20180114_i586_x86_64_Build0001 -->
<obsoletepackage>libdpdk-17_11-0</obsoletepackage>
<obsoletepackage>libgrpc-1_8_3</obsoletepackage>
+ <obsoletepackage>markmywords</obsoletepackage>
<!-- Factory/openSUSE_20180116_i586_x86_64_Build0001 -->
<obsoletepackage>gtk2-immodules-tigrigna</obsoletepackage>
<obsoletepackage>hdf5_1_10_1-gnu-mpich-hpc</obsoletepackage>
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-11-02 04:16:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Fri Nov 2 04:16:16 2018 rev:636 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change
_service:product_converter:openSUSE-Addon-NonOss-release.spec: same change
_service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi: same change
_service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec: same change
_service:product_converter:openSUSE-cd-mini-i586.kiwi: same change
_service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change
++++++ _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.KoRHEd/_old 2018-11-02 04:16:28.561735735 +0100
+++ /var/tmp/diff_new_pack.KoRHEd/_new 2018-11-02 04:16:28.561735735 +0100
@@ -5306,6 +5306,7 @@
<repopackage name="yast2-journal" arch="i586,i686"/>
<repopackage name="yast2-kdump" arch="i586,i686"/>
<repopackage name="yast2-ldap" arch="i586,i686"/>
+ <repopackage name="yast2-logs" arch="i586,i686"/>
<repopackage name="yast2-mail" arch="i586,i686"/>
<repopackage name="yast2-metapackage-handler" arch="i586,i686"/>
<repopackage name="yast2-multipath" arch="i586,i686"/>
++++++ _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.KoRHEd/_old 2018-11-02 04:16:28.573735737 +0100
+++ /var/tmp/diff_new_pack.KoRHEd/_new 2018-11-02 04:16:28.577735739 +0100
@@ -5508,6 +5508,7 @@
<repopackage name="yast2-journal" arch="x86_64"/>
<repopackage name="yast2-kdump" arch="x86_64"/>
<repopackage name="yast2-ldap" arch="x86_64"/>
+ <repopackage name="yast2-logs" arch="x86_64"/>
<repopackage name="yast2-mail" arch="x86_64"/>
<repopackage name="yast2-metapackage-handler" arch="x86_64"/>
<repopackage name="yast2-multipath" arch="x86_64"/>
_service:product_converter:openSUSE-release.spec: same change
openSUSE-Tumbleweed-Kubic-release.spec: same change
openSUSE-release.spec: same change
++++++ DVD5-i586.group ++++++
--- /var/tmp/diff_new_pack.KoRHEd/_old 2018-11-02 04:16:28.653735753 +0100
+++ /var/tmp/diff_new_pack.KoRHEd/_new 2018-11-02 04:16:28.653735753 +0100
@@ -5247,6 +5247,7 @@
<package name="yast2-journal"/>
<package name="yast2-kdump"/>
<package name="yast2-ldap"/>
+ <package name="yast2-logs"/>
<package name="yast2-mail"/>
<package name="yast2-metapackage-handler"/>
<package name="yast2-multipath"/>
++++++ DVD5-x86_64.group ++++++
--- /var/tmp/diff_new_pack.KoRHEd/_old 2018-11-02 04:16:28.677735758 +0100
+++ /var/tmp/diff_new_pack.KoRHEd/_new 2018-11-02 04:16:28.681735759 +0100
@@ -5451,6 +5451,7 @@
<package name="yast2-journal"/>
<package name="yast2-kdump"/>
<package name="yast2-ldap"/>
+ <package name="yast2-logs"/>
<package name="yast2-mail"/>
<package name="yast2-metapackage-handler"/>
<package name="yast2-multipath"/>
1
0
Hello community,
here is the log from the commit of package yast2-fonts for openSUSE:Factory checked in at 2018-11-01 19:57:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-fonts (Old)
and /work/SRC/openSUSE:Factory/.yast2-fonts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fonts"
Thu Nov 1 19:57:37 2018 rev:9 rq:642581 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-fonts/yast2-fonts.changes 2018-04-16 12:47:37.340095419 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-fonts.new/yast2-fonts.changes 2018-11-01 19:57:40.933913109 +0100
@@ -1,0 +2,7 @@
+Wed Oct 17 10:28:50 CEST 2018 - schubi(a)suse.de
+
+- Added %license tag in spec file.
+ Needed to build fix for bnc#1087957 again.
+- 4.0.1
+
+-------------------------------------------------------------------
Old:
----
yast2-fonts-4.0.0.tar.bz2
New:
----
yast2-fonts-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fonts.spec ++++++
--- /var/tmp/diff_new_pack.lRFBbD/_old 2018-11-01 19:57:41.481913063 +0100
+++ /var/tmp/diff_new_pack.lRFBbD/_new 2018-11-01 19:57:41.481913063 +0100
@@ -17,7 +17,7 @@
Name: yast2-fonts
-Version: 4.0.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,7 +44,7 @@
BuildRequires: rubygem(rspec)
Summary: YaST2 - Fonts Configuration
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/YaST
Url: https://github.com/yast/yast-fonts
@@ -81,7 +81,7 @@
%{yast_scrconfdir}/*.scr
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%doc %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/README.subpixel-patents
++++++ yast2-fonts-4.0.0.tar.bz2 -> yast2-fonts-4.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fonts-4.0.0/package/yast2-fonts.changes new/yast2-fonts-4.0.1/package/yast2-fonts.changes
--- old/yast2-fonts-4.0.0/package/yast2-fonts.changes 2018-04-11 10:32:17.000000000 +0200
+++ new/yast2-fonts-4.0.1/package/yast2-fonts.changes 2018-10-17 11:11:02.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 17 10:28:50 CEST 2018 - schubi(a)suse.de
+
+- Added %license tag in spec file.
+ Needed to build fix for bnc#1087957 again.
+- 4.0.1
+
+-------------------------------------------------------------------
Fri Apr 6 18:51:21 UTC 2018 - mfilka(a)suse.com
- bnc#1087957 - version bump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fonts-4.0.0/package/yast2-fonts.spec new/yast2-fonts-4.0.1/package/yast2-fonts.spec
--- old/yast2-fonts-4.0.0/package/yast2-fonts.spec 2018-04-11 10:32:17.000000000 +0200
+++ new/yast2-fonts-4.0.1/package/yast2-fonts.spec 2018-10-17 11:11:02.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-fonts
-Version: 4.0.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,7 +81,7 @@
%{yast_scrconfdir}/*.scr
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%doc %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/README.subpixel-patents
1
0
Hello community,
here is the log from the commit of package yast2-instserver for openSUSE:Factory checked in at 2018-11-01 19:57:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old)
and /work/SRC/openSUSE:Factory/.yast2-instserver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-instserver"
Thu Nov 1 19:57:06 2018 rev:56 rq:642282 version:4.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes 2018-10-12 13:11:16.807249771 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-instserver.new/yast2-instserver.changes 2018-11-01 19:57:08.533915775 +0100
@@ -1,0 +2,6 @@
+Tue Oct 16 11:58:29 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in bsc#1110037.
+- 4.1.2
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-4.1.1.tar.bz2
New:
----
yast2-instserver-4.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.hSWJpI/_old 2018-11-01 19:57:09.053915732 +0100
+++ /var/tmp/diff_new_pack.hSWJpI/_new 2018-11-01 19:57:09.053915732 +0100
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.1.1
+Version: 4.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -80,7 +80,7 @@
%dir /etc/apache2/conf.d
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%changelog
++++++ yast2-instserver-4.1.1.tar.bz2 -> yast2-instserver-4.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.1.1/package/yast2-instserver.changes new/yast2-instserver-4.1.2/package/yast2-instserver.changes
--- old/yast2-instserver-4.1.1/package/yast2-instserver.changes 2018-10-11 16:12:30.000000000 +0200
+++ new/yast2-instserver-4.1.2/package/yast2-instserver.changes 2018-10-16 15:28:04.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Oct 16 11:58:29 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in bsc#1110037.
+- 4.1.2
+
+-------------------------------------------------------------------
Thu Oct 11 13:33:27 UTC 2018 - lslezak(a)suse.cz
- Create the mount point directory if it does not exist yet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.1.1/package/yast2-instserver.spec new/yast2-instserver-4.1.2/package/yast2-instserver.spec
--- old/yast2-instserver-4.1.1/package/yast2-instserver.spec 2018-10-11 16:12:30.000000000 +0200
+++ new/yast2-instserver-4.1.2/package/yast2-instserver.spec 2018-10-16 15:28:04.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.1.1
+Version: 4.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,5 +81,5 @@
%dir /etc/apache2/conf.d
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
1
0
Hello community,
here is the log from the commit of package python3-ipa for openSUSE:Factory checked in at 2018-11-01 19:13:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-ipa (Old)
and /work/SRC/openSUSE:Factory/.python3-ipa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-ipa"
Thu Nov 1 19:13:47 2018 rev:8 rq:645891 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-ipa/python3-ipa.changes 2018-10-02 19:49:34.961696271 +0200
+++ /work/SRC/openSUSE:Factory/.python3-ipa.new/python3-ipa.changes 2018-11-01 19:13:49.722044613 +0100
@@ -1,0 +2,10 @@
+Wed Oct 31 23:13:46 UTC 2018 - Sean Marlow <sean.marlow(a)suse.com>
+
+- Update to v2.2.0 (2018-10-31)
+ + Add network test for sles in ec2.
+ + Remove azure billing tag test.
+ + Fix typo in azure services test name.
+ + Add python3.7 to CI testing.
+ + Add repos for 12SP4 in conftest
+
+-------------------------------------------------------------------
Old:
----
python3-ipa-2.1.0.tar.gz
New:
----
python3-ipa-2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-ipa.spec ++++++
--- /var/tmp/diff_new_pack.42smLf/_old 2018-11-01 19:13:50.098044630 +0100
+++ /var/tmp/diff_new_pack.42smLf/_new 2018-11-01 19:13:50.102044630 +0100
@@ -18,7 +18,7 @@
%bcond_without test
Name: python3-ipa
-Version: 2.1.0
+Version: 2.2.0
Release: 0
Summary: Command line and API for testing custom images
License: GPL-3.0-or-later
++++++ python3-ipa-2.1.0.tar.gz -> python3-ipa-2.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/CHANGES.md new/python3-ipa-2.2.0/CHANGES.md
--- old/python3-ipa-2.1.0/CHANGES.md 2018-10-01 21:26:47.000000000 +0200
+++ new/python3-ipa-2.2.0/CHANGES.md 2018-11-01 00:00:54.000000000 +0100
@@ -1,3 +1,17 @@
+v2.2.0 (2018-10-31)
+===================
+
+- Add network test for sles in ec2.
+ [\#134](https://github.com/SUSE-Enceladus/ipa/pull/134)
+- Remove azure billing tag test.
+ [\#136](https://github.com/SUSE-Enceladus/ipa/pull/136)
+- Fix typo in azure services test name.
+ [\#138](https://github.com/SUSE-Enceladus/ipa/pull/138)
+- Add python3.7 to CI testing.
+ [\#140](https://github.com/SUSE-Enceladus/ipa/pull/140)
+- Add repos for 12SP4 in conftest
+ [\#143](https://github.com/SUSE-Enceladus/ipa/pull/143)
+
v2.1.0 (2018-10-01)
===================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/PKG-INFO new/python3-ipa-2.2.0/PKG-INFO
--- old/python3-ipa-2.1.0/PKG-INFO 2018-10-01 21:36:59.000000000 +0200
+++ new/python3-ipa-2.2.0/PKG-INFO 2018-11-01 00:07:50.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: python3-ipa
-Version: 2.1.0
+Version: 2.2.0
Summary: Package for automated testing of cloud images.
Home-page: https://github.com/SUSE-Enceladus/ipa
Author: SUSE
@@ -146,6 +146,6 @@
Classifier: Programming Language :: Python :: 3.6
Requires-Python: >=3.4
Description-Content-Type: text/markdown
-Provides-Extra: dev
Provides-Extra: test
+Provides-Extra: dev
Provides-Extra: tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/ipa/__init__.py new/python3-ipa-2.2.0/ipa/__init__.py
--- old/python3-ipa-2.1.0/ipa/__init__.py 2018-10-01 21:29:09.000000000 +0200
+++ new/python3-ipa-2.2.0/ipa/__init__.py 2018-11-01 00:01:27.000000000 +0100
@@ -22,4 +22,4 @@
__author__ = """SUSE"""
__email__ = 'public-cloud-dev(a)susecloud.net'
-__version__ = '2.1.0'
+__version__ = '2.2.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/package/python3-ipa.spec new/python3-ipa-2.2.0/package/python3-ipa.spec
--- old/python3-ipa-2.1.0/package/python3-ipa.spec 2018-10-01 21:29:09.000000000 +0200
+++ new/python3-ipa-2.2.0/package/python3-ipa.spec 2018-11-01 00:01:27.000000000 +0100
@@ -18,7 +18,7 @@
%bcond_without test
Name: python3-ipa
-Version: 2.1.0
+Version: 2.2.0
Release: 0
Summary: Command line and API for testing custom images
License: GPL-3.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/python3_ipa.egg-info/PKG-INFO new/python3-ipa-2.2.0/python3_ipa.egg-info/PKG-INFO
--- old/python3-ipa-2.1.0/python3_ipa.egg-info/PKG-INFO 2018-10-01 21:36:59.000000000 +0200
+++ new/python3-ipa-2.2.0/python3_ipa.egg-info/PKG-INFO 2018-11-01 00:07:50.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: python3-ipa
-Version: 2.1.0
+Version: 2.2.0
Summary: Package for automated testing of cloud images.
Home-page: https://github.com/SUSE-Enceladus/ipa
Author: SUSE
@@ -146,6 +146,6 @@
Classifier: Programming Language :: Python :: 3.6
Requires-Python: >=3.4
Description-Content-Type: text/markdown
-Provides-Extra: dev
Provides-Extra: test
+Provides-Extra: dev
Provides-Extra: tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/python3_ipa.egg-info/SOURCES.txt new/python3-ipa-2.2.0/python3_ipa.egg-info/SOURCES.txt
--- old/python3-ipa-2.1.0/python3_ipa.egg-info/SOURCES.txt 2018-10-01 21:36:59.000000000 +0200
+++ new/python3-ipa-2.2.0/python3_ipa.egg-info/SOURCES.txt 2018-11-01 00:07:50.000000000 +0100
@@ -110,17 +110,15 @@
usr/share/lib/ipa/tests/SLES/test_sles_smt_reg.py
usr/share/lib/ipa/tests/SLES/test_sles_wait_on_registration.py
usr/share/lib/ipa/tests/SLES/test_sles_zypper_migration.py
-usr/share/lib/ipa/tests/SLES/Azure/conftest.py
usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure.yaml
usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_accel_networking.py
-usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_billing_tag.py
usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_infiniband.py
-usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_on_demand.yaml
usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_services.py
usr/share/lib/ipa/tests/SLES/EC2/conftest.py
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2.yaml
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_billing_code.py
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_byos.yaml
+usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_no_billing_code.py
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_on_demand.yaml
usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_services.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/setup.cfg new/python3-ipa-2.2.0/setup.cfg
--- old/python3-ipa-2.1.0/setup.cfg 2018-10-01 21:36:59.000000000 +0200
+++ new/python3-ipa-2.2.0/setup.cfg 2018-11-01 00:07:50.000000000 +0100
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 2.1.0
+current_version = 2.2.0
commit = True
tag = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/setup.py new/python3-ipa-2.2.0/setup.py
--- old/python3-ipa-2.1.0/setup.py 2018-10-01 21:29:09.000000000 +0200
+++ new/python3-ipa-2.2.0/setup.py 2018-11-01 00:01:27.000000000 +0100
@@ -43,7 +43,7 @@
setup(
name='python3-ipa',
- version='2.1.0',
+ version='2.2.0',
description="Package for automated testing of cloud images.",
long_description=readme,
long_description_content_type="text/markdown",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/tests/test_ipa_cli.py new/python3-ipa-2.2.0/tests/test_ipa_cli.py
--- old/python3-ipa-2.1.0/tests/test_ipa_cli.py 2018-09-26 21:35:52.000000000 +0200
+++ new/python3-ipa-2.2.0/tests/test_ipa_cli.py 2018-10-31 16:10:33.000000000 +0100
@@ -338,7 +338,7 @@
with runner.isolated_filesystem():
try:
os.makedirs('test')
- except OSError as error:
+ except OSError:
pass
with open('test/.history', 'w') as history_log:
@@ -368,7 +368,7 @@
with runner.isolated_filesystem():
try:
os.makedirs('test')
- except OSError as error:
+ except OSError:
pass
with open('test/.history', 'w') as history_log:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/conftest.py new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/conftest.py
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/conftest.py 2018-06-18 23:44:48.000000000 +0200
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/conftest.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-import json
-import pytest
-
-
-(a)pytest.fixture()
-def get_azure_billing_tag(host):
- def f():
- result = host.run(
- 'sudo azuremetadata --tag'
- )
-
- data = json.loads(result.stdout.strip())
- return data['billingTag']
- return f
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_billing_tag.py new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_billing_tag.py
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_billing_tag.py 2018-06-18 23:44:48.000000000 +0200
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_billing_tag.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-
-
-def test_sles_azure_billing_tag(get_azure_billing_tag):
- assert get_azure_billing_tag()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_on_demand.yaml new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_on_demand.yaml
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_on_demand.yaml 2018-06-18 23:44:48.000000000 +0200
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_on_demand.yaml 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-tests:
- - test_sles_azure_billing_tag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_services.py new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_services.py
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_services.py 2017-09-20 20:58:18.000000000 +0200
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/Azure/test_sles_azure_services.py 2018-10-31 16:10:33.000000000 +0100
@@ -4,5 +4,5 @@
@pytest.mark.parametrize('name', [
('waagent.service'),
])
-def test_sles_ec2_services(check_service, name):
+def test_sles_azure_services(check_service, name):
assert check_service(name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2.yaml new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2.yaml
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2.yaml 2018-01-23 23:53:45.000000000 +0100
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2.yaml 2018-10-31 16:10:33.000000000 +0100
@@ -1,3 +1,4 @@
tests:
- test_sles_ec2_services
- test_sles_ec2_uuid
+ - test_sles_ec2_network
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py 1970-01-01 01:00:00.000000000 +0100
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/EC2/test_sles_ec2_network.py 2018-10-31 16:10:33.000000000 +0100
@@ -0,0 +1,62 @@
+import pytest
+
+
+types = {
+ 'c5d.large': 15,
+ 'd2.xlarge': 15,
+ 'i3.8xlarge': 15,
+ 'i3.metal': 15,
+ 'm5.large': 15,
+ 'm5d.large': 15,
+ 'r5.24xlarge': 15,
+ 't3.small': 15
+}
+
+special_regions = [
+ 'ap-northeast-3',
+ 'cn-north-1',
+ 'cn-northwest-1',
+ 'us-gov-west-1'
+]
+
+
+def test_sles_ec2_network(determine_region, host):
+ """
+ Requires an S3 bucket in each region with the following name:
+ suse-download-test-{region}
+
+ Each bucket contains the iso:
+ SLE-15-Installer-DVD-x86_64-GM-DVD2.iso
+ """
+ result = host.run(
+ 'curl http://169.254.169.254/latest/meta-data/instance-type'
+ )
+ instance_type = result.stdout.strip()
+
+ if instance_type not in types:
+ pytest.skip(
+ 'Unsupported EC2 instance type: {0}.'.format(instance_type)
+ )
+
+ region = determine_region('ec2')
+
+ if region in special_regions:
+ pytest.skip(
+ 'Skipped special region: {0}'.format(region)
+ )
+
+ url = 'https://suse-download-test-{0}.s3.amazonaws.com/' \
+ 'SLE-15-Installer-DVD-x86_64-GM-DVD2.iso'.format(
+ region
+ )
+
+ dl_result = host.run(
+ 'curl -o /dev/null --max-time {0} --silent '
+ '--write-out "%{{size_download}}" {1}'.format(
+ types[instance_type], url
+ )
+ )
+
+ size = dl_result.stdout.strip()
+ if size != '1214599168':
+ raise Exception('Download failed!')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/conftest.py new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/conftest.py
--- old/python3-ipa-2.1.0/usr/share/lib/ipa/tests/SLES/conftest.py 2018-08-15 16:27:14.000000000 +0200
+++ new/python3-ipa-2.2.0/usr/share/lib/ipa/tests/SLES/conftest.py 2018-10-31 20:06:48.000000000 +0100
@@ -150,6 +150,32 @@
'SLE-HA12-SP3-Updates'
]
+SLE_12_SP4_BASE = [
+ 'SLES12-SP4-Debuginfo-Pool',
+ 'SLES12-SP4-Debuginfo-Updates',
+ 'SLES12-SP4-Pool',
+ 'SLES12-SP4-Updates',
+ 'SLE-SDK12-SP4-Debuginfo-Pool',
+ 'SLE-SDK12-SP4-Debuginfo-Updates',
+ 'SLE-SDK12-SP4-Pool',
+ 'SLE-SDK12-SP4-Updates'
+]
+
+SLE_12_SP4_MODULES = SLE_12_SP3_MODULES
+
+SLE_12_SP4_SAP = [
+ 'SLE12-SP4-SAP-Debuginfo-Pool',
+ 'SLE-12-SP4-SAP-Debuginfo-Updates',
+ 'SLE12-SP4-SAP-Pool',
+ 'SLE12-SP4-SAP-Source-Pool',
+ 'SLE-12-SP4-SAP-Updates',
+ 'SLE-HA12-SP4-Debuginfo-Pool',
+ 'SLE-HA12-SP4-Debuginfo-Updates',
+ 'SLE-HA12-SP4-Pool',
+ 'SLE-HA12-SP4-Source-Pool',
+ 'SLE-HA12-SP4-Updates'
+]
+
SLE_15_BASE = [
'SLE-Module-Basesystem15-Debuginfo-Pool',
'SLE-Module-Basesystem15-Debuginfo-Updates',
@@ -222,6 +248,8 @@
'12-SP2-SAP': SLE_12_SP2_SAP + SLE_12_SP2_BASE + SLE_12_SP2_MODULES,
'12-SP3': SLE_12_SP3_BASE + SLE_12_SP3_MODULES,
'12-SP3-SAP': SLE_12_SP3_SAP + SLE_12_SP3_BASE + SLE_12_SP3_MODULES,
+ '12-SP4': SLE_12_SP4_BASE + SLE_12_SP4_MODULES,
+ '12-SP4-SAP': SLE_12_SP4_SAP + SLE_12_SP4_BASE + SLE_12_SP4_MODULES,
'15': SLE_15_BASE + SLE_15_MODULES + SLE_15_PRODUCTS,
'15-SAP': SLE_15_SAP + SLE_15_BASE + SLE_15_MODULES
}
1
0
Hello community,
here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2018-11-01 19:12:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Thu Nov 1 19:12:49 2018 rev:202 rq:645895 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings-devel-doc.changes 2013-10-20 10:56:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings-devel-doc.changes 2018-11-01 19:12:53.050042375 +0100
@@ -1,0 +2,5 @@
+Fri Aug 17 15:33:34 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2018-07-07 21:57:22.203395912 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2018-11-01 19:12:53.098042377 +0100
@@ -1,0 +2,30 @@
+Wed Oct 31 11:41:54 UTC 2018 - jreidinger(a)suse.com
+
+- Fix probing repository with URL including variable (bsc#1090193)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Oct 29 16:53:20 UTC 2018 - jreidinger(a)suse.com
+
+- Drop no longer used methods:
+-- SetArchitecture and SystemArchitecture as only user Product
+ Creator is dropped
+-- AddLock, GetLocks, RemoveLock as it was needed only once for
+ specific architecture that is no longer supported
+-- TargetRebuildInit as recreating rpm database is no longer used
+ during upgrade
+-- TargetFileHasOwner as old workaround for upgrade no longer
+ needed
+-- TargetBlockSize as it is not longer needed to count disk usage
+
+-------------------------------------------------------------------
+Tue Oct 16 15:03:37 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Aug 17 15:36:16 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-4.0.13.tar.bz2
New:
----
yast2-pkg-bindings-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.TS5Hat/_old 2018-11-01 19:12:53.590042397 +0100
+++ /var/tmp/diff_new_pack.TS5Hat/_new 2018-11-01 19:12:53.594042397 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
@@ -35,7 +35,7 @@
BuildArch: noarch
Requires: yast2-pkg-bindings = %{version}
Summary: YaST2 - Documentation for yast2-pkg-bindings package
-License: GPL-2.0
+License: GPL-2.0-only
Group: Documentation/HTML
%description
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.TS5Hat/_old 2018-11-01 19:12:53.606042397 +0100
+++ /var/tmp/diff_new_pack.TS5Hat/_new 2018-11-01 19:12:53.610042398 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -32,7 +32,7 @@
BuildRequires: yast2-devtools >= 3.1.10
Summary: YaST2 - Package Manager Access
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -57,5 +57,6 @@
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-pkg-bindings-4.0.13.tar.bz2 -> yast2-pkg-bindings-4.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.changes new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.changes
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.changes 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.changes 2018-11-01 12:34:09.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Aug 17 15:33:34 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Thu Oct 17 10:55:21 UTC 2013 - jreidinger(a)suse.com
- remove usage of dropped y2doc generator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.spec 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.spec 2018-11-01 12:34:09.000000000 +0100
@@ -16,9 +16,9 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 4.0.13
+Version: 4.1.0
Release: 0
-License: GPL-2.0
+License: GPL-2.0-only
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.changes 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.changes 2018-11-01 12:34:09.000000000 +0100
@@ -1,4 +1,34 @@
-------------------------------------------------------------------
+Wed Oct 31 11:41:54 UTC 2018 - jreidinger(a)suse.com
+
+- Fix probing repository with URL including variable (bsc#1090193)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Oct 29 16:53:20 UTC 2018 - jreidinger(a)suse.com
+
+- Drop no longer used methods:
+-- SetArchitecture and SystemArchitecture as only user Product
+ Creator is dropped
+-- AddLock, GetLocks, RemoveLock as it was needed only once for
+ specific architecture that is no longer supported
+-- TargetRebuildInit as recreating rpm database is no longer used
+ during upgrade
+-- TargetFileHasOwner as old workaround for upgrade no longer
+ needed
+-- TargetBlockSize as it is not longer needed to count disk usage
+
+-------------------------------------------------------------------
+Tue Oct 16 15:03:37 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Aug 17 15:36:16 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Wed Jul 4 12:55:04 CEST 2018 - schubi(a)suse.de
- SavePkgService: Checking if the service file still exists before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.spec 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.spec 2018-11-01 12:34:09.000000000 +0100
@@ -17,14 +17,14 @@
Name: yast2-pkg-bindings
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0
+License: GPL-2.0-only
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
@@ -59,3 +59,4 @@
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Arch.cc new/yast2-pkg-bindings-4.1.0/src/Arch.cc
--- old/yast2-pkg-bindings-4.0.13/src/Arch.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Arch.cc 2018-11-01 12:34:09.000000000 +0100
@@ -31,7 +31,6 @@
#include <string>
#include <ycp/YCPString.h>
-#include <ycp/YCPBoolean.h>
#include <zypp/ZConfig.h>
@@ -50,49 +49,3 @@
y2milestone("Current system architecture: %s", arch.c_str());
return YCPString(arch);
}
-
-/**
- * @builtin SetArchitecture
- * @short
- * @description Change the architecture. The package manager (libzypp)
- * does not expect that the system architecture will change at runtime.
- * It should be set as soon as possible before using other commands.
- * @param string architecture the new architecture, e.g. "i386", "ppc", "s390x"...
- * @return boolean true on success
- */
-YCPValue
-PkgFunctions::SetArchitecture(const YCPString &architecture)
-{
- std::string arch(architecture->value());
-
- try
- {
- y2warning("Switching architecture to: %s", arch.c_str());
- zypp::Arch new_arch(arch);
- zypp::ZConfig::instance().setSystemArchitecture(new_arch);
- }
- catch (const zypp::Exception& excpt)
- {
- y2error("Switching to architecture %s failed: %s", arch.c_str(), excpt.asString().c_str());
- _last_error.setLastError(ExceptionAsString(excpt));
- return YCPBoolean(false);
- }
-
- return YCPBoolean(true);
-}
-
-/**
- * @builtin SystemArchitecture
- * @short
- * @description
- * @return string default system architecture for the system
- */
-YCPValue
-PkgFunctions::SystemArchitecture()
-{
- std::string def_arch(zypp::ZConfig::defaultSystemArchitecture().asString());
- y2milestone("Default system architecture: %s", def_arch.c_str());
-
- return YCPString(def_arch);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Locks.cc new/yast2-pkg-bindings-4.1.0/src/Locks.cc
--- old/yast2-pkg-bindings-4.0.13/src/Locks.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Locks.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,513 +0,0 @@
-/* ------------------------------------------------------------------------------
- * Copyright (c) 2008 Novell, Inc. All Rights Reserved.
- *
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of version 2 of the GNU General Public License as published by the
- * Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, contact Novell, Inc.
- *
- * To contact Novell about this file by physical or electronic mail, you may find
- * current contact information at www.novell.com.
- * ------------------------------------------------------------------------------
- */
-
-/*
- File: $Id$
- Author: Ladislav Slezák <lslezak(a)novell.com>
- Namespace: Pkg
- Summary: Functions for accessing locks in the package manager
-*/
-
-
-#include <ostream>
-
-#include "PkgFunctions.h"
-#include "log.h"
-
-#include <y2util/Y2SLog.h>
-
-#include <ycp/YCPList.h>
-#include <ycp/YCPMap.h>
-#include <ycp/YCPString.h>
-#include <ycp/YCPVoid.h>
-#include <ycp/YCPBoolean.h>
-#include <ycp/YCPInteger.h>
-
-#include <zypp/Locks.h>
-
-// UINT_MAX
-#include <climits>
-
-
-/**
- * @builtin AddLock
- * @short Add a lock to the package manager
- * @description
- * Add a new lock to the package manager. Input parameter is a map $[ "kind" : list<string>,
- * "install_status":string, "repo_id":list<integer>, "case_sensitive" : boolean, "global_string":list<string>
- * "string_type" : string, "solvable:.*" : list<string> ]
- *
- * see http://en.opensuse.org/Libzypp/Locksfile for more information
- * @param map lock Definition of the lock
- * @return boolean true on success
- */
-YCPValue
-PkgFunctions::AddLock(const YCPMap &lock)
-{
- zypp::PoolQuery query;
-
- try
- {
- for_(map_it, lock.begin(), lock.end())
- {
- YCPValue key(map_it->first);
- YCPValue val(map_it->second);
-
- if (key.isNull())
- {
- y2warning("Warning: ignoring 'nil' key in lock map");
- continue;
- }
-
- if (val.isNull())
- {
- y2warning("Warning: ignoring 'nil' value in lock map");
- continue;
- }
-
- if (key->isString())
- {
- std::string key_str(key->asString()->value());
-
- // add kind
- if (key_str == "kind")
- {
- if (val->isList())
- {
- YCPList items(val->asList());
-
- int index = 0;
- int list_size = items.size();
-
- while(index < list_size)
- {
- YCPValue list_item(items->value(index));
-
- if (!list_item.isNull() && list_item->isString())
- {
- query.addKind(zypp::ResKind(list_item->asString()->value()));
- }
- else
- {
- y2error("Invalid item at index %d in \"kind\" list", index);
- return YCPBoolean(false);
- }
-
- index++;
- }
- }
- else
- {
- y2error("Error %s is not list", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else if (key_str == "install_status")
- {
- if (val->isString())
- {
- std::string status_str(val->asString()->value());
-
- if (status_str == "installed")
- {
- query.setInstalledOnly();
- }
- else if (status_str == "uninstalled")
- {
- query.setUninstalledOnly();
- }
- else if (status_str == "all")
- {
- query.setStatusFilterFlags(zypp::PoolQuery::ALL);
- }
- else
- {
- y2error("Unknown install_status status value: %s", status_str.c_str());
- return YCPBoolean(false);
- }
- }
- else
- {
- y2error("Type of key 'install_status' must be string, found: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else if (key_str == "repo_id")
- {
- if (val->isList())
- {
- YCPList items(val->asList());
-
- int index = 0;
- int list_size = items.size();
-
- while(index < list_size)
- {
- YCPValue list_item(items->value(index));
-
- if (!list_item.isNull() && list_item->isInteger())
- {
- RepoId repo_id = list_item->asInteger()->value();
-
- YRepo_Ptr repo_ptr = logFindRepository(repo_id);
-
- if (repo_ptr)
- {
- query.addRepo(repo_ptr->repoInfo().alias());
- }
- else
- {
- y2error("Repository %lld not found", repo_id);
- return YCPBoolean(false);
- }
- }
- else
- {
- y2error("Invalid item at index %d in \"repo_id\" list", index);
- return YCPBoolean(false);
- }
-
- index++;
- }
- }
- else
- {
- y2error("Error: 'repo_id' value is not list: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else if (key_str == "case_sensitive")
- {
- if (val->isBoolean())
- {
- bool cs = val->asBoolean()->value();
- query.setCaseSensitive(cs);
- }
- else
- {
- y2error("Type of key 'case_sensitive' must be boolean, found: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else if (key_str == "global_string")
- {
- if (val->isList())
- {
- YCPList items(val->asList());
-
- int index = 0;
- int list_size = items.size();
-
- while(index < list_size)
- {
- YCPValue list_item(items->value(index));
-
- if (!list_item.isNull() && list_item->isString())
- {
- std::string global_str = list_item->asString()->value();
- query.addString(global_str);
- }
- else
- {
- y2error("Invalid item at index %d in \"global_string\" list: %s, string expected", index, list_item->toString().c_str());
- return YCPBoolean(false);
- }
-
- index++;
- }
- }
- else
- {
- y2error("Error: 'global_string' value is not list: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else if (key_str == "string_type")
- {
- if (val->isString())
- {
- std::string str_type = val->asString()->value();
-
- if (str_type == "exact")
- query.setMatchExact();
- else if (str_type == "substring")
- query.setMatchSubstring();
- else if (str_type == "glob")
- query.setMatchGlob();
- else if (str_type == "regex")
- query.setMatchRegex();
- else
- {
- y2error("Unknown 'string_type' value: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- else
- {
- y2error("Type of key 'string_type' must be string, found: %s", val->toString().c_str());
- return YCPBoolean(false);
- }
- }
- // it is probably an attribute
- else if (std::string(key_str, 0, 9) == "solvable:")
- {
- if (val->isList())
- {
- YCPList items(val->asList());
-
- int index = 0;
- int list_size = items.size();
-
- while(index < list_size)
- {
- YCPValue list_item(items->value(index));
-
- if (!list_item.isNull() && list_item->isString())
- {
- std::string attr = list_item->asString()->value();
-
- query.addAttribute(zypp::sat::SolvAttr(key_str), attr);
- }
- else
- {
- y2error("Invalid item at index %d at \"%s\" key: %s, string expected", index, key_str.c_str(), list_item->toString().c_str());
- return YCPBoolean(false);
- }
-
- index++;
- }
- }
- else
- {
- y2error("Error: value '%s' in list at key '%s' is not a list", val->toString().c_str(), key_str.c_str());
- return YCPBoolean(false);
- }
- }
- }
- else
- {
- y2error("Key %s is not string", key->toString().c_str());
- }
- }
-
- // and finally add the lock
- zypp::Locks &locks = zypp::Locks::instance();
-
- DBG << "Adding query: " << query << std::endl;
-
- locks.addLock(query);
-
- // merge the lock to the current locks (to be returned by GetLocks())
- locks.merge();
- }
- catch (zypp::Exception & excpt)
- {
- y2warning("Error while parsing lock map %s: %s", lock->toString().c_str(), excpt.asString().c_str());
- return YCPBoolean(false);
- }
-
- return YCPBoolean(true);
-}
-
-
-YCPMap PkgFunctions::PoolQuery2YCPMap(const zypp::PoolQuery &pool_query)
-{
- YCPMap lock;
-
- zypp::PoolQuery::AttrRawStrMap attrs(pool_query.attributes());
-
- // add attributes - name, summary...
- if (!attrs.empty())
- {
- for_(attr_it, attrs.begin(), attrs.end())
- {
- YCPList attr_list;
-
- for_(attr_list_it, attr_it->second.begin(), attr_it->second.end())
- {
- attr_list->add(YCPString(*attr_list_it));
- }
-
- lock->add(YCPString(attr_it->first.asString()), attr_list);
- }
-
- }
-
- // add "kind" attribute
- if (!pool_query.kinds().empty())
- {
- YCPList kind_list;
-
- for_(kind_it, pool_query.kinds().begin(), pool_query.kinds().end())
- {
- kind_list->add(YCPString(kind_it->asString()));
- }
-
- lock->add(YCPString("kind"), kind_list);
- }
-
- // add "install_status" attribute
- std::string status;
-
- switch(pool_query.statusFilterFlags())
- {
- case zypp::PoolQuery::ALL : status = "all"; break;
- case zypp::PoolQuery::INSTALLED_ONLY : status = "installed"; break;
- case zypp::PoolQuery::UNINSTALLED_ONLY : status = "uninstalled"; break;
- }
-
- if (!status.empty())
- {
- lock->add(YCPString("install_status"), YCPString(status));
- }
-
- // add "repo" attribute
- if (!pool_query.repos().empty())
- {
- YCPList repo_id_list;
-
- for_(repo_it, pool_query.repos().begin(), pool_query.repos().end())
- {
- repo_id_list->add(YCPInteger(logFindAlias(*repo_it)));
- }
-
- lock->add(YCPString("repo_id"), repo_id_list);
- }
-
-
- // add "case_sensitive" attribute
- lock->add(YCPString("case_sensitive"), YCPBoolean(pool_query.caseSensitive()));
-
- // add "global_string" attribute
- if (!pool_query.strings().empty())
- {
- YCPList glob_string;
-
- for_(string_it, pool_query.strings().begin(), pool_query.strings().end())
- {
- glob_string->add(YCPString(*string_it));
- }
-
- lock->add(YCPString("global_string"), glob_string);
- }
-
- // add "string_type" attribute
- std::string str_type;
-
- switch(pool_query.matchMode())
- {
- case zypp::Match::STRING : str_type = "exact"; break;
- case zypp::Match::SUBSTRING : str_type = "substring"; break;
- case zypp::Match::GLOB : str_type = "glob"; break;
- case zypp::Match::REGEX : str_type = "regex"; break;
- default: break;
- }
-
- if (!str_type.empty())
- {
- lock->add(YCPString("string_type"), YCPString(str_type));
- }
-
- return lock;
-}
-
-/**
- * @builtin GetLocks
- * @short Get list of current locks
- * @description
- * Returns list of of current locks, see AddLock() for details about returned lock map.
- *
- * see http://en.opensuse.org/Libzypp/Locksfile for more information
- * @return list list of locks (YCP maps)
- */
-YCPValue PkgFunctions::GetLocks()
-{
- YCPList ret;
-
- zypp::Locks &locks = zypp::Locks::instance();
-
- for_(it, locks.begin(), locks.end())
- {
- ret->add(PoolQuery2YCPMap(*it));
- }
-
- return ret;
-}
-
-
-/**
- * @builtin RemoveLock
- * @short Remove a lock
- * @description
- * Removes a lock from the package manager
- *
- * @param integer lock_idx index of the lock to remove, use GetLocks() function for obtaining the index
- * @return boolean true on success
- */
-YCPValue PkgFunctions::RemoveLock(const YCPInteger &lock_idx)
-{
- if (lock_idx.isNull())
- {
- y2error("Invaid lock index: nil");
- return YCPBoolean(false);
- }
-
- long long idxl = lock_idx->value();
-
- // libzypp uses unsigned int, but YCP has 64 bit integers, check limits
- if (idxl < 0 || idxl > UINT_MAX)
- {
- y2error("Invalid lock index: %lld", idxl);
- return YCPBoolean(false);
- }
-
- // convert to unsigned (it's safe due to the above check)
- unsigned int idx = idxl;
-
- try
- {
- zypp::Locks &locks = zypp::Locks::instance();
-
- if (locks.size() < idx + 1)
- {
- y2error("Invalid lock index %d, %zd locks defined", idx, locks.size());
- return YCPBoolean(false);
- }
-
- zypp::Locks::const_iterator it = locks.begin();
-
- unsigned int i = 0;
- while(i < idx)
- {
- it++;
- i++;
- }
-
- locks.removeLock(*it);
- return YCPBoolean(true);
- }
- catch (zypp::Exception &excpt)
- {
- y2warning("Error while removing lock %d: %s", idx, excpt.asString().c_str());
- }
-
- return YCPBoolean(false);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Makefile.am new/yast2-pkg-bindings-4.1.0/src/Makefile.am
--- old/yast2-pkg-bindings-4.0.13/src/Makefile.am 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Makefile.am 2018-11-01 12:34:09.000000000 +0100
@@ -32,7 +32,7 @@
Resolvable_Patches.cc \
Resolvable_Properties.cc \
Target.cc Target_DU.cc Target_Load.cc \
- Locale.cc Locks.cc \
+ Locale.cc \
Source_Callbacks.cc \
Source_Create.cc \
Source_Download.cc \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/PkgFunctions.h new/yast2-pkg-bindings-4.1.0/src/PkgFunctions.h
--- old/yast2-pkg-bindings-4.0.13/src/PkgFunctions.h 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/PkgFunctions.h 2018-11-01 12:34:09.000000000 +0100
@@ -206,8 +206,6 @@
// convert MountPointSet to YCP Map
YCPMap MPS2YCPMap(const zypp::DiskUsageCounter::MountPointSet &mps);
- YCPMap PoolQuery2YCPMap(const zypp::PoolQuery &pool_query);
-
zypp::Url shortenUrl(const zypp::Url &url);
// convert Exception to string represenatation
@@ -577,8 +575,6 @@
// target related
/* TYPEINFO: boolean(string,boolean)*/
YCPValue TargetInit (const YCPString& root, const YCPBoolean& unused);
- /* TYPEINFO: boolean(string)*/
- YCPValue TargetRebuildInit(const YCPString& root);
/* TYPEINFO: boolean(string)*/
YCPValue TargetInitialize (const YCPString& root);
/* TYPEINFO: boolean(string, map<any,any>)*/
@@ -595,8 +591,6 @@
YCPInteger TargetUsed (const YCPString&);
/* TYPEINFO: integer(string)*/
YCPInteger TargetAvailable (const YCPString&);
- /* TYPEINFO: integer(string)*/
- YCPInteger TargetBlockSize (const YCPString&);
/* TYPEINFO: boolean(string)*/
YCPBoolean TargetInstall (const YCPString&);
/* TYPEINFO: boolean(string)*/
@@ -607,8 +601,6 @@
YCPValue TargetInitDU (const YCPList&);
/* TYPEINFO: map<string,list<integer>>()*/
YCPValue TargetGetDU ();
- /* TYPEINFO: boolean(string)*/
- YCPBoolean TargetFileHasOwner (const YCPString&);
/* TYPEINFO: boolean(string,symbol)*/
YCPBoolean TargetStoreRemove(const YCPString& root, const YCPSymbol& kind_r);
@@ -714,13 +706,6 @@
/* TYPEINFO: boolean(integer)*/
YCPValue RemoveUpgradeRepo(const YCPInteger &repo);
- /* TYPEINFO: boolean(map<string,any>)*/
- YCPValue AddLock(const YCPMap &lock);
- /* TYPEINFO: list<map<string,any>>()*/
- YCPValue GetLocks();
- /* TYPEINFO: boolean(integer)*/
- YCPValue RemoveLock(const YCPInteger &lock_idx);
-
/* TYPEINFO: list<list<integer>>()*/
YCPValue PkgMediaSizes ();
/* TYPEINFO: list<list<integer>>()*/
@@ -755,10 +740,6 @@
// architecture related
/* TYPEINFO: string()*/
YCPValue GetArchitecture();
- /* TYPEINFO: boolean(string)*/
- YCPValue SetArchitecture(const YCPString &architecture);
- /* TYPEINFO: string()*/
- YCPValue SystemArchitecture();
/* TYPEINFO: boolean(string,symbol)*/
YCPValue ResolvableInstall( const YCPString& name_r, const YCPSymbol& kind_r );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Source_Create.cc new/yast2-pkg-bindings-4.1.0/src/Source_Create.cc
--- old/yast2-pkg-bindings-4.0.13/src/Source_Create.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Source_Create.cc 2018-11-01 12:34:09.000000000 +0100
@@ -757,7 +757,7 @@
{
ids->add(YCPInteger(*it));
}
-
+
return ids;
}
}
@@ -776,7 +776,7 @@
try
{
- zypp::Url probe_url(url->value());
+ zypp::Url probe_url(ExpandedUrl(url)->asString()->value());
y2milestone("Probing repository type: '%s'...", probe_url.asString().c_str());
// add the product directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target.cc new/yast2-pkg-bindings-4.1.0/src/Target.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target.cc 2018-11-01 12:34:09.000000000 +0100
@@ -158,29 +158,6 @@
/**
- @builtin TargetFileHasOwner
-
- @short returns true if the file is owned by a package
- @param string filepath
- @return boolean
-*/
-
-YCPBoolean
-PkgFunctions::TargetFileHasOwner (const YCPString& filepath)
-{
- try
- {
- return YCPBoolean (!zypp_ptr()->target()->whoOwnsFile(filepath->value()).empty());
- }
- catch (...)
- {
- }
-
- return YCPBoolean(false);
-}
-
-
-/**
@builtin TargetStoreRemove
@short remove all resolvables from the DB in the target system (removes only metadata in the package manager!)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target_DU.cc new/yast2-pkg-bindings-4.1.0/src/Target_DU.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target_DU.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target_DU.cc 2018-11-01 12:34:09.000000000 +0100
@@ -117,24 +117,6 @@
return YCPInteger (avail);
}
-/** ------------------------
- *
- * @builtin TargetBlockSize
- *
- * @short Return block size of partition at directory
- * @param string directory
- * @return integer
- *
- */
-YCPInteger
-PkgFunctions::TargetBlockSize (const YCPString& dir)
-{
- long long used, size, bsize, avail;
- get_disk_stats (dir->value().c_str(), &used, &size, &bsize, &avail);
-
- return YCPInteger (bsize);
-}
-
// helper funtion
// initialize the disk usage counter with the current values from the system
void PkgFunctions::SetCurrentDU()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target_Load.cc new/yast2-pkg-bindings-4.1.0/src/Target_Load.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target_Load.cc 2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target_Load.cc 2018-11-01 12:34:09.000000000 +0100
@@ -126,19 +126,6 @@
/** ------------------------
*
- * @builtin TargetRebuildInit
- * @short Similar to TargetInit, but the RPM DB is rebuilt ('rpm --rebuilddb') before reading it
- * @param string root Root Directory
- * @return boolean
- */
-YCPValue
-PkgFunctions::TargetRebuildInit(const YCPString& root)
-{
- return TargetInitInternal(root, true);
-}
-
-/** ------------------------
- *
* @builtin TargetInitialize
* @short Initialize Target, read the keys.
* @param string root Root Directory
1
0
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2018-11-01 19:12:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Thu Nov 1 19:12:15 2018 rev:412 rq:645894 version:4.1.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2018-09-04 22:51:57.080134635 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2018-11-01 19:12:18.702040952 +0100
@@ -1,0 +2,73 @@
+Thu Nov 1 08:03:27 UTC 2018 - jreidinger(a)suse.com
+
+- extra_urls: compare unexpanded urls, so two identical
+ repositories with variables are detected (bsc#1090193)
+- 4.1.24
+
+-------------------------------------------------------------------
+Mon Oct 29 13:02:11 CET 2018 - schubi(a)suse.de
+
+- Added save_y2logs client. (fate#325737)
+- 4.1.23
+
+-------------------------------------------------------------------
+Thu Oct 25 08:02:13 UTC 2018 - lslezak(a)suse.cz
+
+- Remember the selected role (related to FATE#325834)
+- 4.1.22
+
+-------------------------------------------------------------------
+Tue Oct 23 14:17:49 CEST 2018 - schubi(a)suse.de
+
+- Saving y2logs after the installation has been finished.
+ (fate#325737)
+- 4.1.21
+
+-------------------------------------------------------------------
+Tue Oct 16 13:52:00 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in fate#324713
+- 4.1.20
+
+-------------------------------------------------------------------
+Tue Sep 25 15:11:15 UTC 2018 - dgonzalez(a)suse.com
+
+- Skip the roles' dialog selection when there is only one available
+ (fate#324713)
+- 4.1.19
+
+-------------------------------------------------------------------
+Tue Sep 25 13:34:50 UTC 2018 - dgonzalez(a)suse.com
+
+- Fix syntax error (bsc#1109659)
+- 4.1.18
+
+-------------------------------------------------------------------
+Tue Sep 25 10:35:03 CEST 2018 - schubi(a)suse.de
+
+- Updated docu for add_on_products.xml: Added tag "confirm_license"
+ to handle Add-On-products licenses which will be added while
+ installation. (bsc#1105758)
+- 4.1.17
+
+-------------------------------------------------------------------
+Tue Sep 18 09:33:59 UTC 2018 - dgonzalez(a)suse.com
+
+- Avoid to restore old backups when upgrade fails (bsc#1097297)
+- 4.1.16
+
+-------------------------------------------------------------------
+Thu Sep 13 16:37:43 UTC 2018 - lslezak(a)suse.cz
+
+- Copy the selected packages from the self-update repository to an
+ additional add-on repository, allow updating the installation
+ workflow from the self-update repository (bsc#1101016)
+- 4.1.15
+
+-------------------------------------------------------------------
+Tue Sep 11 15:29:22 CEST 2018 - aschnell(a)suse.com
+
+- do not translate snapshot description (bsc#1092757)
+- 4.1.14
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.1.13.tar.bz2
New:
----
yast2-installation-4.1.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.07HxDy/_old 2018-11-01 19:12:19.322040979 +0100
+++ /var/tmp/diff_new_pack.07HxDy/_new 2018-11-01 19:12:19.326040979 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.1.13
+Version: 4.1.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,8 +47,8 @@
BuildRequires: yast2 >= 4.1.3
Requires: yast2 >= 4.1.3
-# Yast::Packages.check_remote_installation_packages
-BuildRequires: yast2-packager >= 4.0.9
+# Y2Packager::SelfUpdateAddonRepo
+BuildRequires: yast2-packager >= 4.1.5
# Y2Storage::Inhibitors including systemd masking
BuildRequires: yast2-storage-ng >= 4.0.194
@@ -64,8 +64,8 @@
# Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0
-# Yast::AddOnProduct.selected_installation_products
-Requires: yast2-packager >= 4.0.56
+# Y2Packager::SelfUpdateAddonRepo
+Requires: yast2-packager >= 4.1.5
# use in startup scripts
Requires: initviocons
@@ -252,7 +252,7 @@
%dir %{yast_vardir}/hooks/installation
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
++++++ yast2-installation-4.1.13.tar.bz2 -> yast2-installation-4.1.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/Rakefile new/yast2-installation-4.1.24/Rakefile
--- old/yast2-installation-4.1.13/Rakefile 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/Rakefile 2018-11-01 12:33:37.000000000 +0100
@@ -1,4 +1,6 @@
require "yast/rake"
+require "find"
+require "English"
Yast::Tasks.configuration do |conf|
# lets ignore license check for now
@@ -22,3 +24,16 @@
end
task tarball: :check_rng_status
+
+# Extend the "check:syntax" task to check also the shell scripts
+task :"check:syntax" do
+ puts "* Checking the startup shell scripts..."
+ Find.find("startup") do |path|
+ # simple and stupid check, either it's executable or ends with .sh
+ next unless File.file?(path) && (File.executable?(path) || path.end_with?(".sh"))
+ # -n = read commands but do not execute them, syntax check only
+ system("bash", "-n", path)
+ raise "Syntax check failed" unless $CHILD_STATUS.success?
+ end
+ puts "* Done"
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/doc/SELF_UPDATE.md new/yast2-installation-4.1.24/doc/SELF_UPDATE.md
--- old/yast2-installation-4.1.13/doc/SELF_UPDATE.md 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/doc/SELF_UPDATE.md 2018-11-01 12:33:37.000000000 +0100
@@ -31,9 +31,14 @@
containing the updates.
2. If updates are available, they will be downloaded. Otherwise, the process
will be silently skipped.
-3. The updates will be applied to the installation system.
+3. The updates will be applied to the installation system, the meta-packages
+ which are needed by the installer are copied to the inst-sys instead of
+ applying.
4. YaST will be restarted to reload the modified files and the installation
will be resumed.
+5. The selected meta-packages copied to the inst-sys are added as an add-on
+ installation repository to allow updating the `skelcd-*` or `*-release`
+ packages via the self-update repository.
### Language Selection
@@ -67,7 +72,9 @@
YaST will use RPM packages stored in a rpm-md repository, although they are
handled in a different way:
-* All RPMs in the repository are considered (no "patch" metadata).
+* All RPMs in the repository are considered (no "patch" metadata), only some
+ meta-packages are skipped (e.g. the packages providing `system-installation()`
+ or `product()`, it does not make sense to apply them to the inst-sys).
* RPMs are not installed in the usual way: they're uncompressed and no scripts
are executed.
* No dependency checks are performed. RPMs are added in alphabetical order.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/doc/features.md new/yast2-installation-4.1.24/doc/features.md
--- old/yast2-installation-4.1.13/doc/features.md 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/doc/features.md 2018-11-01 12:33:37.000000000 +0100
@@ -60,6 +60,15 @@
default is 'false' (optional)
-->
<selected config:type="boolean">true</selected>
+ <!--
+ Defines priority of the newly added repository (optional).
+ Libzypp uses its default priority if not set.
+ -->
+ <priority config:type="integer">20</priority>
+ <!--
+ User has to accept license?
+ -->
+ <confirm_license config:type="boolean">true</confirm_license>
</product_item>
<!-- Another product item -->
@@ -95,6 +104,12 @@
- (boolean) *selected* - Defines the default state of *pre-selected*
state in case of *ask\_user* used; default is *false*
+- (integer) *priority* - Defines priority of the newly added repository.
+ Libzypp uses its default priority if not set.
+
+- (boolean) *confirm_license* - User has to accept license if available?
+ default: AutoYaST installation:false ; normal installation:true
+
- (list \<string\>) *install\_products/product* - List of products to
add if there are more than one products at the repository URL; if
not defined, all products are installed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/package/yast2-installation.changes new/yast2-installation-4.1.24/package/yast2-installation.changes
--- old/yast2-installation-4.1.13/package/yast2-installation.changes 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/package/yast2-installation.changes 2018-11-01 12:33:37.000000000 +0100
@@ -1,4 +1,77 @@
-------------------------------------------------------------------
+Thu Nov 1 08:03:27 UTC 2018 - jreidinger(a)suse.com
+
+- extra_urls: compare unexpanded urls, so two identical
+ repositories with variables are detected (bsc#1090193)
+- 4.1.24
+
+-------------------------------------------------------------------
+Mon Oct 29 13:02:11 CET 2018 - schubi(a)suse.de
+
+- Added save_y2logs client. (fate#325737)
+- 4.1.23
+
+-------------------------------------------------------------------
+Thu Oct 25 08:02:13 UTC 2018 - lslezak(a)suse.cz
+
+- Remember the selected role (related to FATE#325834)
+- 4.1.22
+
+-------------------------------------------------------------------
+Tue Oct 23 14:17:49 CEST 2018 - schubi(a)suse.de
+
+- Saving y2logs after the installation has been finished.
+ (fate#325737)
+- 4.1.21
+
+-------------------------------------------------------------------
+Tue Oct 16 13:52:00 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in fate#324713
+- 4.1.20
+
+-------------------------------------------------------------------
+Tue Sep 25 15:11:15 UTC 2018 - dgonzalez(a)suse.com
+
+- Skip the roles' dialog selection when there is only one available
+ (fate#324713)
+- 4.1.19
+
+-------------------------------------------------------------------
+Tue Sep 25 13:34:50 UTC 2018 - dgonzalez(a)suse.com
+
+- Fix syntax error (bsc#1109659)
+- 4.1.18
+
+-------------------------------------------------------------------
+Tue Sep 25 10:35:03 CEST 2018 - schubi(a)suse.de
+
+- Updated docu for add_on_products.xml: Added tag "confirm_license"
+ to handle Add-On-products licenses which will be added while
+ installation. (bsc#1105758)
+- 4.1.17
+
+-------------------------------------------------------------------
+Tue Sep 18 09:33:59 UTC 2018 - dgonzalez(a)suse.com
+
+- Avoid to restore old backups when upgrade fails (bsc#1097297)
+- 4.1.16
+
+-------------------------------------------------------------------
+Thu Sep 13 16:37:43 UTC 2018 - lslezak(a)suse.cz
+
+- Copy the selected packages from the self-update repository to an
+ additional add-on repository, allow updating the installation
+ workflow from the self-update repository (bsc#1101016)
+- 4.1.15
+
+-------------------------------------------------------------------
+Tue Sep 11 15:29:22 CEST 2018 - aschnell(a)suse.com
+
+- do not translate snapshot description (bsc#1092757)
+- 4.1.14
+
+-------------------------------------------------------------------
Tue Sep 4 13:34:17 UTC 2018 - dgonzalez(a)suse.com
- Use /media.1/media instead the /media.1/build (bsc#1062297)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/package/yast2-installation.spec new/yast2-installation-4.1.24/package/yast2-installation.spec
--- old/yast2-installation-4.1.13/package/yast2-installation.spec 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/package/yast2-installation.spec 2018-11-01 12:33:37.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-installation
-Version: 4.1.13
+Version: 4.1.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -46,8 +46,8 @@
BuildRequires: yast2 >= 4.1.3
Requires: yast2 >= 4.1.3
-# Yast::Packages.check_remote_installation_packages
-BuildRequires: yast2-packager >= 4.0.9
+# Y2Packager::SelfUpdateAddonRepo
+BuildRequires: yast2-packager >= 4.1.5
# Y2Storage::Inhibitors including systemd masking
BuildRequires: yast2-storage-ng >= 4.0.194
@@ -63,8 +63,8 @@
# Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0
-# Yast::AddOnProduct.selected_installation_products
-Requires: yast2-packager >= 4.0.56
+# Y2Packager::SelfUpdateAddonRepo
+Requires: yast2-packager >= 4.1.5
# use in startup scripts
Requires: initviocons
@@ -251,6 +251,6 @@
%dir %{yast_vardir}/hooks/installation
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/clients/save_y2logs.rb new/yast2-installation-4.1.24/src/clients/save_y2logs.rb
--- old/yast2-installation-4.1.13/src/clients/save_y2logs.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-4.1.24/src/clients/save_y2logs.rb 2018-11-01 12:33:37.000000000 +0100
@@ -0,0 +1,2 @@
+require "installation/clients/save_y2logs"
+Yast::SaveY2logs.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/clients/inst_extrasources.rb new/yast2-installation-4.1.24/src/lib/installation/clients/inst_extrasources.rb
--- old/yast2-installation-4.1.13/src/lib/installation/clients/inst_extrasources.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/clients/inst_extrasources.rb 2018-11-01 12:33:37.000000000 +0100
@@ -345,7 +345,7 @@
result = srcs.each_with_object([]) do |src, ret|
general = Pkg.SourceGeneralData(src)
- url = general["url"]
+ url = general["raw_url"]
next if url.nil? || url.empty?
@local_urls[src] = url if Mode.update && url =~ /^dir:\/+mnt\/+/
# check for USB sources which should be disabled
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-4.1.24/src/lib/installation/clients/inst_update_installer.rb
--- old/yast2-installation-4.1.13/src/lib/installation/clients/inst_update_installer.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/clients/inst_update_installer.rb 2018-11-01 12:33:37.000000000 +0100
@@ -15,6 +15,7 @@
require "installation/updates_manager"
require "installation/update_repositories_finder"
+require "y2packager/self_update_addon_repo"
require "uri"
require "yaml"
@@ -112,6 +113,10 @@
updated = update_repositories.map { |u| add_repository(u) }.any?
if updated
+ # copy the addon packages before applying the updates to inst-sys,
+ # #apply_all removes the repositories!
+ Yast::Progress.NextStage
+ copy_addon_packages
log.info("Applying installer updates")
Yast::Progress.NextStage
updates_manager.apply_all
@@ -387,6 +392,7 @@
# TRANSLATORS: progress label
_("Add Update Repository"),
_("Download the Packages"),
+ _("Copy the Addon Packages"),
_("Apply the Packages"),
_("Restart")
]
@@ -508,5 +514,15 @@
log.info("Processing profile location...")
ProfileLocation.Process
end
+
+ #
+ # Copy the addon packages from the self-update repositories to the inst-sys
+ #
+ def copy_addon_packages
+ log.info("Copying optional addon packages from the self update repositories...")
+ updates_manager.repositories.each do |u|
+ ::Y2Packager::SelfUpdateAddonRepo.copy_packages(u.repo_id)
+ end
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/clients/save_y2logs.rb new/yast2-installation-4.1.24/src/lib/installation/clients/save_y2logs.rb
--- old/yast2-installation-4.1.13/src/lib/installation/clients/save_y2logs.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-4.1.24/src/lib/installation/clients/save_y2logs.rb 2018-11-01 12:33:37.000000000 +0100
@@ -0,0 +1,25 @@
+# encoding: utf-8
+# File: src/lib/installation/clients/inst_save_y2logs.rb
+# Module: Installation
+# Summary: Saving y2logs by calling save_y2logs
+#
+
+module Yast
+ class SaveY2logs < Client
+ def main
+ Yast.import "Directory"
+ Yast.import "Installation"
+ Yast.import "ProductFeatures"
+
+ if ProductFeatures.GetBooleanFeature("globals", "save_y2logs")
+ target_path = ::File.join(
+ Yast::Installation.destdir,
+ Yast::Directory.logdir
+ )
+
+ WFM.Execute(Yast::Path.new(".local.bash"),
+ "/usr/sbin/save_y2logs '#{target_path}/yast-installation-logs.tar.xz'")
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/copy_logs_finish.rb new/yast2-installation-4.1.24/src/lib/installation/copy_logs_finish.rb
--- old/yast2-installation-4.1.13/src/lib/installation/copy_logs_finish.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/copy_logs_finish.rb 2018-11-01 12:33:37.000000000 +0100
@@ -32,6 +32,7 @@
Yast.import "Directory"
Yast.import "Installation"
+ Yast.import "ProductFeatures"
end
def steps
@@ -88,6 +89,9 @@
end
end
+ # Saving y2logs
+ WFM.CallFunction("save_y2logs")
+
nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/select_system_role.rb new/yast2-installation-4.1.24/src/lib/installation/select_system_role.rb
--- old/yast2-installation-4.1.13/src/lib/installation/select_system_role.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/select_system_role.rb 2018-11-01 12:33:37.000000000 +0100
@@ -35,11 +35,6 @@
class SelectSystemRole < ::UI::InstallationDialog
include UI::TextHelpers
- class << self
- # once the user selects a role, remember it in case they come back
- attr_accessor :original_role_id
- end
-
NON_OVERLAY_ATTRIBUTES = [
"additional_dialogs",
"id",
@@ -60,10 +55,18 @@
if Yast::GetInstArgs.going_back
# If coming back, we have to run the additional dialogs first...
- clients = additional_clients_for(self.class.original_role_id)
+ clients = additional_clients_for(SystemRole.current)
direction = run_clients(clients, going_back: true)
- # ... and only run the main dialog (super) if we are *still* going back
- return direction unless direction == :back
+ # ...and only run the main dialog (super) if there is more than one role (fate#324713) and we
+ # are *still* going back
+ return direction if single_role? || direction != :back
+ end
+
+ if single_role?
+ # Apply the role and skip the dialog when there is only one (fate#324713)
+ log.info "Only one role available, applying it and skipping the dialog"
+ clear_role
+ return select_role(roles.first.id)
end
super
@@ -78,7 +81,7 @@
end
def dialog_content
- @selected_role_id = self.class.original_role_id
+ @selected_role_id = SystemRole.current
@selected_role_id ||= roles.first && roles.first.id if SystemRole.default?
HCenter(ReplacePoint(Id(:rp), role_buttons(selected_role_id: @selected_role_id)))
@@ -92,26 +95,7 @@
end
def next_handler
- role_id = @selected_role_id
-
- if role_id.nil? # no role selected (bsc#1078809)
- # An Error popup
- msg = _("Select one of the available roles to continue.")
- Yast::Popup.Error(msg)
- return
- end
-
- orig_role_id = self.class.original_role_id
- if !orig_role_id.nil? && orig_role_id != role_id
- # A Continue-Cancel popup
- msg = _("Changing the system role may undo adjustments you may have done.")
- return unless Yast::Popup.ContinueCancel(msg)
- end
- self.class.original_role_id = role_id
-
- apply_role(SystemRole.find(role_id))
-
- result = run_clients(additional_clients_for(role_id))
+ result = select_role(@selected_role_id)
# We show the main role dialog; but the additional clients have
# drawn over it, so draw it again and go back to input loop.
# create_dialog do not create new dialog if it already exist like in this
@@ -139,6 +123,35 @@
private
+ # checks if there is only one role available
+ def single_role?
+ roles.size == 1
+ end
+
+ # Applies the role with given id and run its additional clients, if any
+ #
+ # @param role_id [Integer] The role to be applied
+ #
+ # @see run_clients
+ #
+ # @return [:next,:back,:abort] which direction the additional dialogs exited
+ def select_role(role_id)
+ if role_id.nil?
+ # no role selected (bsc#1078809)
+ Yast::Popup.Error(_("Select one of the available roles to continue."))
+ return :back
+ end
+
+ if SystemRole.current && SystemRole.current != role_id
+ # Changing the role, show a Continue-Cancel popup to user
+ msg = _("Changing the system role may undo adjustments you may have done.")
+ return :back unless Yast::Popup.ContinueCancel(msg)
+ end
+
+ apply_role(role_id)
+ run_clients(additional_clients_for(role_id))
+ end
+
# gets array of clients to run for given role
def additional_clients_for(role_id)
role = SystemRole.find(role_id)
@@ -192,8 +205,10 @@
end
# Applies given role to configuration
- def apply_role(role)
- log.info "Applying system role '#{role.id}'"
+ def apply_role(role_id)
+ log.info "Applying system role '#{role_id}'"
+
+ role = SystemRole.select(role_id)
role.overlay_features
adapt_services(role)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/snapshots_finish.rb new/yast2-installation-4.1.24/src/lib/installation/snapshots_finish.rb
--- old/yast2-installation-4.1.13/src/lib/installation/snapshots_finish.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/snapshots_finish.rb 2018-11-01 12:33:37.000000000 +0100
@@ -48,15 +48,15 @@
def create_post_snapshot
pre_number = Yast2::FsSnapshotStore.load("update")
- # TRANSLATORS: label for filesystem snapshot taken after system update
- Yast2::FsSnapshot.create_post(_("after update"), pre_number, cleanup: :number, important: true)
+ # as of bsc #1092757 snapshot descriptions are not translated
+ Yast2::FsSnapshot.create_post("after update", pre_number, cleanup: :number, important: true)
Yast2::FsSnapshotStore.clean("update")
true
end
def create_single_snapshot
- # TRANSLATORS: label for filesystem snapshot taken after system installation
- Yast2::FsSnapshot.create_single(_("after installation"), cleanup: :number, important: true)
+ # as of bsc #1092757 snapshot descriptions are not translated
+ Yast2::FsSnapshot.create_single("after installation", cleanup: :number, important: true)
true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/system_role.rb new/yast2-installation-4.1.24/src/lib/installation/system_role.rb
--- old/yast2-installation-4.1.13/src/lib/installation/system_role.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/system_role.rb 2018-11-01 12:33:37.000000000 +0100
@@ -130,6 +130,8 @@
# @see current
def select(role_id)
@current_role = find(role_id)
+ log.info("Selected role: #{current}")
+ current_role
end
# Returns the current role id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/src/lib/installation/update_repository.rb new/yast2-installation-4.1.24/src/lib/installation/update_repository.rb
--- old/yast2-installation-4.1.13/src/lib/installation/update_repository.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/src/lib/installation/update_repository.rb 2018-11-01 12:33:37.000000000 +0100
@@ -18,6 +18,7 @@
require "packages/package_downloader"
require "packages/package_extractor"
+require "y2packager/self_update_addon_filter"
Yast.import "Pkg"
Yast.import "Progress"
@@ -136,10 +137,11 @@
add_repo
end
- # Retrieves the list of packages to install
+ # Retrieves the list of packages to unpack to the inst-sys
#
- # Only packages in the update repository are considered. Packages are
- # sorted by name (alphabetical order).
+ # Only packages in the update repository are considered, meta-packages
+ # which should be used in an add-on and not applied to the inst-sys are ignored.
+ # The packages are sorted by name (alphabetical order).
#
# @return [Array<Hash>] List of packages to install
#
@@ -149,7 +151,11 @@
add_repo
candidates = Yast::Pkg.ResolvableProperties("", :package, "")
@packages = candidates.select { |p| p["source"] == repo_id }.sort_by! { |a| a["name"] }
- log.info "Considering #{(a)packages.size} packages: #{@packages}"
+ log.info "Found #{(a)packages.size} packages: #{@packages}"
+ # remove packages which are used as addons, these should not be applied to the inst-sys
+ addon_pkgs = Y2Packager::SelfUpdateAddonFilter.packages(repo_id)
+ @packages.reject! { |p| addon_pkgs.include?(p["name"]) }
+ log.info "Using #{(a)packages.size} packages: #{@packages}"
@packages
end
@@ -245,10 +251,9 @@
# Determine whether the repository is empty or not
#
# @return [Boolean] true if the repository is empty; false otherwise.
- #
- # @see #packages
def empty?
- packages.empty?
+ candidates = Yast::Pkg.ResolvableProperties("", :package, "")
+ candidates.none? { |p| p["source"] == repo_id }
end
# Returns whether is a user defined repository
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/startup/YaST2.call new/yast2-installation-4.1.24/startup/YaST2.call
--- old/yast2-installation-4.1.13/startup/YaST2.call 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/startup/YaST2.call 2018-11-01 12:33:37.000000000 +0100
@@ -148,7 +148,7 @@
# ---
#
:
- export Y2STYLE="installation_slim"
+ export Y2STYLE="installation_slim"
set_inst_qt_env
}
@@ -268,7 +268,7 @@
{
# SecondStageRequired can be set:
# 1. after 1st stage (note 2nd stage is not always required)
- # 2. after 2nd stage (when another YaST run is required due to e.g.
+ # 2. after 2nd stage (when another YaST run is required due to e.g.
# kernel update)
if [ -f /etc/install.inf ] ; then
@@ -282,17 +282,47 @@
fi
}
+#---[ validate_backup ]---#
+function validate_backup () {
+ # Check that the ID and VERSION_ID in the backup os-release file
+ # matches with the values in the /etc/os-release to considered it
+ # as a valid backup to be restored (bsc#1097297)
+ #
+ # See also https://www.freedesktop.org/software/systemd/man/os-release.html
+ root="/mnt"
+ backup_id=$(grep "^ID=" $root/var/adm/backup/os-release | cut -d'=' -f2 | tr -d '"')
+ backup_version_id=$(grep "^VERSION_ID=" $root/var/adm/backup/os-release | cut -d'=' -f2 | tr -d '"')
+ backup_version="$backup_id-$backup_version_id"
+ current_id=$(grep "^ID=" $root/etc/os-release | cut -d'=' -f2 | tr -d '"')
+ current_version_id=$(grep "^VERSION_ID=" $root/etc/os-release | cut -d'=' -f2 | tr -d '"')
+ current_version="$current_id-$current_version_id"
+
+ log "Checking if it is a valid backup"
+
+ if [ $backup_version = $current_version ]; then
+ return 0
+ else
+ log "\tNot valid backup version. Expected: $current_version. Found: $backup_version"
+ return 1
+ fi
+}
#----[ restore_backup ]----#
function restore_backup () {
# restores backup if it is available
- if [ -d /mnt/var/adm/backup/system-upgrade ]; then
- log "\tStarting restore scripts"
- for i in /mnt/var/adm/backup/system-upgrade/restore-*.sh; do
- log "\tStarting $i"
- sh $i /mnt
- done
+ if [ -d /mnt/var/adm/backup/system-upgrade ]; then
+ if validate_backup; then
+ log "\tStarting restore scripts"
+
+ for i in /mnt/var/adm/backup/system-upgrade/restore-*.sh; do
+ log "\tStarting $i"
+
+ sh $i /mnt
+ done
+ else
+ log "\tBackup was not restore because its version info does not match"
fi
+ fi
}
#----[ start_yast ]----#
@@ -679,7 +709,7 @@
# when found the ssh daemon is killed, so create this file as the very last step!!
# (https://github.com/openSUSE/installation-images/blob/c57181329ab7040369da70…)
echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished
-fi
+fi
if [ $SELECTED_MEDIUM != "SSH" ] && [ "$Y2_MODE" = "ncurses" ]; then
# Enable display of status messages on the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/test/inst_extrasources_test.rb new/yast2-installation-4.1.24/test/inst_extrasources_test.rb
--- old/yast2-installation-4.1.13/test/inst_extrasources_test.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/test/inst_extrasources_test.rb 2018-11-01 12:33:37.000000000 +0100
@@ -12,10 +12,10 @@
subject.instance_variable_set(:"@usb_sources", {})
allow(Yast::Pkg).to receive(:SourceGetCurrent).with(false).and_return([0, 1, 2, 3])
- allow(Yast::Pkg).to receive(:SourceGeneralData).with(0).and_return("url" => "http://test.com/")
+ allow(Yast::Pkg).to receive(:SourceGeneralData).with(0).and_return("raw_url" => "http://test.com/")
allow(Yast::Pkg).to receive(:SourceGeneralData).with(1)
- .and_return("url" => "usb://device=/dev/disk/by-id/usb-15")
- allow(Yast::Pkg).to receive(:SourceGeneralData).with(2).and_return("url" => "dir:///mnt/path")
+ .and_return("raw_url" => "usb://device=/dev/disk/by-id/usb-15")
+ allow(Yast::Pkg).to receive(:SourceGeneralData).with(2).and_return("raw_url" => "dir:///mnt/path")
allow(Yast::Pkg).to receive(:SourceGeneralData).with(3).and_return({})
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/test/inst_update_installer_test.rb new/yast2-installation-4.1.24/test/inst_update_installer_test.rb
--- old/yast2-installation-4.1.13/test/inst_update_installer_test.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/test/inst_update_installer_test.rb 2018-11-01 12:33:37.000000000 +0100
@@ -14,7 +14,7 @@
let(:manager) do
double("update_manager", all_signed?: all_signed?, apply_all: true,
- repositories?: has_repos)
+ repositories?: has_repos, repositories: repos)
end
let(:url) { "http://update.opensuse.org/\$arch/update.dud" }
let(:real_url) { "http://update.opensuse.org/#{arch}/update.dud" }
@@ -26,6 +26,8 @@
let(:all_signed?) { true }
let(:network_running) { true }
let(:has_repos) { true }
+ let(:repo) { double("repo", repo_id: 42) }
+ let(:repos) { [repo] }
let(:restarting) { false }
let(:profile) { {} }
let(:ay_profile) { double("Yast::Profile", current: profile) }
@@ -43,6 +45,7 @@
allow(subject).to receive(:require).with("registration/url_helpers").and_raise(LoadError)
stub_const("Registration::Storage::InstallationOptions", FakeInstallationOptions)
stub_const("Registration::Storage::Config", FakeRegConfig)
+ allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)
# skip the libzypp initialization globally, enable in the specific tests
allow(subject).to receive(:initialize_packager).and_return(true)
@@ -111,14 +114,22 @@
context "and update works" do
before do
- allow(subject).to receive(:update_installer).and_return(true)
+ allow(subject).to receive(:self_update_enabled?).and_return(true)
+ allow(subject).to receive(:add_repository).and_return(true)
+ allow(manager).to receive(:apply_all)
+ allow(::FileUtils).to receive(:touch)
+ allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)
end
it "creates update file and returns :restart_yast" do
- expect(::FileUtils).to receive(:touch).once
- allow(subject).to receive(:self_update_enabled?).and_return(true)
expect(subject.main).to eq(:restart_yast)
end
+
+ it "copies the add-on packages from the self-update repository" do
+ expect(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages)
+ .with(repo.repo_id)
+ subject.main
+ end
end
context "and update fails" do
@@ -154,6 +165,7 @@
context "when repository is empty" do
let(:has_repos) { false }
+ let(:repos) { [] }
it "does not restart YaST" do
expect(manager).to receive(:add_repository)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/test/lib/clients/inst_system_analysis_test.rb new/yast2-installation-4.1.24/test/lib/clients/inst_system_analysis_test.rb
--- old/yast2-installation-4.1.13/test/lib/clients/inst_system_analysis_test.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/test/lib/clients/inst_system_analysis_test.rb 2018-11-01 12:33:37.000000000 +0100
@@ -43,6 +43,7 @@
allow(storage).to receive(:activate).and_return activate_result
allow(storage).to receive(:probe).and_return probe_result
allow(Yast::Mode).to receive(:auto).and_return(auto)
+ allow(Yast::Execute).to receive(:locally!)
stub_const("Y2Autoinstallation::ActivateCallbacks", callbacks_class)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/test/lib/clients/save_y2logs_test.rb new/yast2-installation-4.1.24/test/lib/clients/save_y2logs_test.rb
--- old/yast2-installation-4.1.13/test/lib/clients/save_y2logs_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-4.1.24/test/lib/clients/save_y2logs_test.rb 2018-11-01 12:33:37.000000000 +0100
@@ -0,0 +1,36 @@
+#!/usr/bin/env rspec
+
+require_relative "../../test_helper"
+require "installation/clients/save_y2logs"
+
+Yast.import "ProductFeatures"
+
+describe Yast::SaveY2logs do
+ subject(:client) { described_class.new }
+
+ describe "#main" do
+ let(:bash_path) { Yast::Path.new(".local.bash") }
+
+ context "globals/save_y2logs in control.xml is false" do
+ it "does not save y2logs" do
+ expect(Yast::ProductFeatures).to receive(:GetBooleanFeature).with("globals", "save_y2logs").and_return(false)
+ expect(Yast::WFM).not_to receive(:Execute).with(
+ bash_path,
+ "/usr/sbin/save_y2logs '/var/log/YaST2/yast-installation-logs.tar.xz'"
+ )
+ client.main
+ end
+ end
+
+ context "globals/save_y2logs in control.xml is true" do
+ it "saves y2logs" do
+ expect(Yast::ProductFeatures).to receive(:GetBooleanFeature).with("globals", "save_y2logs").and_return(true)
+ expect(Yast::WFM).to receive(:Execute).with(
+ bash_path,
+ "/usr/sbin/save_y2logs '/var/log/YaST2/yast-installation-logs.tar.xz'"
+ )
+ client.main
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.1.13/test/select_system_role_test.rb new/yast2-installation-4.1.24/test/select_system_role_test.rb
--- old/yast2-installation-4.1.13/test/select_system_role_test.rb 2018-09-04 16:13:02.000000000 +0200
+++ new/yast2-installation-4.1.24/test/select_system_role_test.rb 2018-11-01 12:33:37.000000000 +0100
@@ -13,6 +13,7 @@
"Lorem Ipsum #{s}"
end
+ allow(Installation::SystemRole).to receive(:select)
allow(Yast::UI).to receive(:ChangeWidget)
allow(Yast::Language).to receive(:language).and_return("en_US")
@@ -21,12 +22,10 @@
describe "#run" do
before do
- # reset previous test
- subject.class.original_role_id = nil
-
allow(Yast::ProductFeatures).to receive(:ClearOverlay)
- allow(Yast::ProductFeatures).to receive(:SetOverlay) # .with
+ allow(Yast::ProductFeatures).to receive(:SetOverlay)
allow(Yast::Packages).to receive(:SelectSystemPatterns)
+ allow(Installation::SystemRole).to receive(:current)
end
context "when no roles are defined" do
@@ -41,6 +40,90 @@
end
end
+ context "when single role is defined" do
+ let(:additional_dialogs) { "" }
+ let(:control_file_roles) do
+ [
+ { "id" => "bar", "order" => "200",
+ "software" => { "desktop" => "knome" }, "additional_dialogs" => additional_dialogs }
+ ]
+ end
+
+ before do
+ allow(Yast::ProductControl).to receive(:system_roles)
+ .and_return(control_file_roles)
+ allow(Yast::WFM).to receive(:CallFunction).and_return(:next)
+ allow(Installation::SystemRole).to receive(:select).with("bar")
+ .and_return(Installation::SystemRole.new(id: "bar", order: 200))
+ end
+
+ it "(re)sets ProductFeatures" do
+ expect(Yast::ProductFeatures).to receive(:ClearOverlay)
+ expect(Yast::ProductFeatures).to receive(:SetOverlay)
+
+ subject.run
+ end
+
+ context "and going forward" do
+ before do
+ allow(Yast::UI).to receive(:UserInput).and_return(:next)
+ end
+
+ it "does not display dialog" do
+ expect(Yast::Wizard).to_not receive(:SetContents)
+ expect(Yast::UI).to_not receive(:UserInput)
+ expect(Yast::UI).to_not receive(:QueryWidget)
+
+ subject.run
+ end
+
+ it "returns :next" do
+ expect(subject.run).to be(:next)
+ end
+
+ context "and there are additional dialogs" do
+ let(:additional_dialogs) { "a,b" }
+
+ it "shows the first one" do
+ expect(Yast::WFM).to receive(:CallFunction).with("a", anything).and_return(:next)
+
+ subject.run
+ end
+ end
+ end
+
+ context "and going back" do
+ before do
+ allow(Installation::SystemRole).to receive(:current).and_return("bar")
+ allow(Yast::GetInstArgs).to receive(:going_back).and_return(true)
+ allow(Yast::UI).to receive(:UserInput).and_return(:back)
+ end
+
+ it "does not display dialog" do
+ expect(Yast::Wizard).to_not receive(:SetContents)
+ expect(Yast::UI).to_not receive(:UserInput)
+ expect(Yast::UI).to_not receive(:QueryWidget)
+
+ subject.run
+ end
+
+ it "returns :back" do
+ expect(subject.run).to be(:back)
+ end
+
+ context "and there are additional dialogs" do
+ let(:additional_dialogs) { "a,b" }
+
+ it "shows the last one" do
+ allow(Yast::GetInstArgs).to receive(:going_back).and_return(true)
+ expect(Yast::WFM).to receive(:CallFunction).with("b", anything).and_return(:next)
+
+ subject.run
+ end
+ end
+ end
+ end
+
context "when some roles are defined" do
let(:control_file_roles) do
[
@@ -53,6 +136,10 @@
before do
allow(Yast::ProductControl).to receive(:system_roles)
.and_return(control_file_roles)
+ allow(Installation::SystemRole).to receive(:select).with("foo")
+ .and_return(Installation::SystemRole.new(id: "foo", order: 100))
+ allow(Installation::SystemRole).to receive(:select).with("bar")
+ .and_return(Installation::SystemRole.new(id: "bar", order: 200))
end
it "displays dialog, and sets ProductFeatures on Next" do
@@ -61,7 +148,7 @@
.and_return("foo", :next)
expect(Yast::ProductFeatures).to receive(:ClearOverlay)
- expect(Yast::ProductFeatures).to receive(:SetOverlay) # .with
+ expect(Yast::ProductFeatures).to receive(:SetOverlay)
expect(subject.run).to eq(:next)
end
@@ -89,7 +176,7 @@
end
it "shows the last dialog when going back" do
- subject.class.original_role_id = "bar"
+ allow(Installation::SystemRole).to receive(:current).and_return("bar")
allow(Yast::GetInstArgs).to receive(:going_back).and_return(true)
expect(Yast::Wizard).to_not receive(:SetContents)
expect(Yast::UI).to_not receive(:UserInput)
@@ -103,8 +190,7 @@
context "when re-selecting the same role" do
it "just proceeds without a popup" do
- subject.class.original_role_id = "foo"
-
+ allow(Installation::SystemRole).to receive(:current).and_return("foo")
allow(Yast::Wizard).to receive(:SetContents)
allow(Yast::UI).to receive(:UserInput)
.and_return("foo", :next)
@@ -120,8 +206,7 @@
context "when re-selecting a different role" do
it "displays a popup, and proceeds if Continue is answered" do
- subject.class.original_role_id = "bar"
-
+ allow(Installation::SystemRole).to receive(:current).and_return("bar")
allow(Yast::Wizard).to receive(:SetContents)
allow(Yast::UI).to receive(:UserInput)
.and_return("foo", :next)
@@ -136,8 +221,7 @@
end
it "displays a popup, and does not proceed if Cancel is answered" do
- subject.class.original_role_id = "bar"
-
+ allow(Installation::SystemRole).to receive(:current).and_return("bar")
allow(Yast::Wizard).to receive(:SetContents)
allow(Yast::UI).to receive(:UserInput)
.and_return("foo", :next, :back)
1
0