September 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62494 - in /trunk/network: VERSION package/yast2-network.changes src/clients/lan_auto.ycp src/config/networking.rnc src/modules/Lan.ycp
by mzugec＠svn2.opensuse.org 17 Sep '10

17 Sep '10

Author: mzugec Date: Fri Sep 17 11:27:58 2010 New Revision: 62494 URL: http://svn.opensuse.org/viewcvs/yast?rev=62494&view=rev Log: AY: added IPv6 option (bnc#633310) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/config/networking.rnc trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62494&r1=624… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Sep 17 11:27:58 2010 @@ -1 +1 @@ -2.19.37 +2.19.38 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Sep 17 11:27:58 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 17 11:27:05 CEST 2010 - mzugec(a)suse.cz + +- AY: added IPv6 option (bnc#633310) +- 2.19.38 + +------------------------------------------------------------------- Thu Aug 19 14:08:33 CEST 2010 - mzugec(a)suse.de - warn user about nm-applet/knetworkmanager (bnc#627273) Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp… ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Fri Sep 17 11:27:58 2010 @@ -253,6 +253,8 @@ map ret = $[]; ret["managed"] = settings["managed"]:false; + if(haskey(settings, "ipv6")) + ret["ipv6"] = settings["ipv6"]:true; if (size(modules) > 0 ) ret["modules"] = modules; if (size(dns) > 0 ) Modified: trunk/network/src/config/networking.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/networking.rn… ============================================================================== --- trunk/network/src/config/networking.rnc (original) +++ trunk/network/src/config/networking.rnc Fri Sep 17 11:27:58 2010 @@ -6,6 +6,7 @@ networking = element networking { element start_immediately { BOOLEAN }? & + ipv6? & managed? & strict_IP_check_timeout? & interfaces & @@ -19,6 +20,9 @@ managed = element managed { BOOLEAN } +ipv6 = + element ipv6 { BOOLEAN } + strict_IP_check_timeout = element strict_IP_check_timeout { INTEGER } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Sep 17 11:27:58 2010 @@ -609,6 +609,7 @@ DNS::Import((map) eval(settings["dns"]:$[])); Routing::Import((map) eval(settings["routing"]:$[])); NetworkService::SetManaged (settings["managed"]:false); + if(haskey(settings, "ipv6")) ipv6=settings["ipv6"]:true; LanItems::modified = true; return true; @@ -621,18 +622,20 @@ global define map Export() { map devices = NetworkInterfaces::Export("netcard"); map udev_rules = LanUdevAuto::Export(devices); - return $[ + map ay = $[ "dns" : DNS::Export(), // FIXME: MOD "modules" : Modules, "s390-devices" : udev_rules["s390-devices"]:$[], "net-udev" : udev_rules["net-udev"]:$[], "config" : NetworkConfig::Export(), "devices" : devices, -// "hwcfg" : NetworkModules::Export("netcard"), + "ipv6" : ipv6, "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), "start_immediately": LanItems::autoinstall_settings["start_immediately"]:false, //start_immediately, ]; + y2milestone("Exported map: %1", ay); + return ay; } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62493 - /tags/branch-Linux-11_3-2_21_73/gtk/
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:49:05 2010 New Revision: 62493 URL: http://svn.opensuse.org/viewcvs/yast?rev=62493&view=rev Log: Created tag branch-Linux-11_3-2_21_73 for gtk Added: tags/branch-Linux-11_3-2_21_73/gtk/ - copied from r62492, branches/SuSE-Linux-11_3-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62492 - /tags/branch-Linux-11_3-2_21_73/
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:48:44 2010 New Revision: 62492 URL: http://svn.opensuse.org/viewcvs/yast?rev=62492&view=rev Log: Created tag branch-Linux-11_3-2_21_73 Added: tags/branch-Linux-11_3-2_21_73/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62491 - in /branches/SuSE-Linux-11_3-Branch/gtk: ChangeLog VERSION VERSION.cmake package/yast2-gtk.changes src/pkg/YGPackageSelector.cc src/pkg/yzyppwrapper.cc src/pkg/yzyppwrapper.h
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:48:38 2010 New Revision: 62491 URL: http://svn.opensuse.org/viewcvs/yast?rev=62491&view=rev Log: Milestone version. Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog branches/SuSE-Linux-11_3-Branch/gtk/VERSION branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.h Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/Ch… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog Tue Sep 14 15:48:38 2010 @@ -1,3 +1,11 @@ +2010-09-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: fix bug 637761: run + solver one final time at apply. (backport) + + * src/pkg/yzyppwrapper.h/cc: added supporting methods. + (backport) + 2010-08-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGUI.cc & src/YGDialog.cc: bug fix 633498: set Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION Tue Sep 14 15:48:38 2010 @@ -1 +1 @@ -2.21.72 +2.21.73 Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake Tue Sep 14 15:48:38 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "72") +SET(VERSION_PATCH "73") Modified: branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes Tue Sep 14 15:48:38 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 14 14:48:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.73 +- sw_single: run solver at end, fixes bnc#620513. + +------------------------------------------------------------------- Mon Aug 30 18:05:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.72 Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc Tue Sep 14 15:48:38 2010 @@ -266,13 +266,13 @@ return confirmed; } - virtual bool acceptLicense (Ypp::Selectable &sel, const std::string &license) + virtual bool showLicense (Ypp::Selectable &sel, const std::string &license) { return acceptText (sel, _("License Agreement"), _("Do you accept the terms of this license?"), license); } - virtual bool displayMessage (Ypp::Selectable &sel, const std::string &message) + virtual bool showMessage (Ypp::Selectable &sel, const std::string &message) { return acceptText (sel, _("Warning Message"), _("Install anyway"), message); } virtual bool resolveProblems (const std::list <Ypp::Problem *> &problems) @@ -699,6 +699,7 @@ dialog->setTitle (title); Ypp::setInterface (impl); + Ypp::runSolver(); // check dependencies at start impl->refreshQuery(); if (summaryMode()) popupChanges(); @@ -720,6 +721,11 @@ void YGPackageSelector::apply() { + if (!Ypp::runSolver()) return; // final dependencies check + if (onlineUpdateMode()) + if (!Ypp::showPendingLicenses (Ypp::Selectable::PATCH)) return; + if (!Ypp::showPendingLicenses (Ypp::Selectable::PACKAGE)) return; + if (Ypp::isModified()) { // confirm if (!onlineUpdateMode() && confirmUnsupported()) { if (!impl->confirmUnsupported()) Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.cc Tue Sep 14 15:48:38 2010 @@ -17,6 +17,7 @@ #include <algorithm> static Ypp::Interface *g_interface = 0; +static bool g_autoSolver = true; // Repository @@ -322,14 +323,14 @@ default: { if (!m_sel->hasLicenceConfirmed()) { ZyppResObject obj = m_sel->candidateObj(); - if (obj) { + if (obj && g_interface && g_autoSolver) { const std::string &license = obj->licenseToConfirm(); - if (!license.empty() && g_interface) - if (!g_interface->acceptLicense (*this, license)) + if (!license.empty()) + if (!g_interface->showLicense (*this, license)) return; const std::string &msg = obj->insnotify(); - if (!msg.empty() && g_interface) - if (!g_interface->displayMessage (*this, msg)) + if (!msg.empty()) + if (!g_interface->showMessage (*this, msg)) return; } m_sel->setLicenceConfirmed(); @@ -379,11 +380,11 @@ _zyppPool().eraseRequestedLocale (m_locale); break; default: { - if (m_sel->hasCandidateObj()) { + if (m_sel->hasCandidateObj() && g_interface && g_autoSolver) { ZyppResObject obj = m_sel->candidateObj(); const std::string &msg = obj->delnotify(); - if (!msg.empty() && g_interface) - if (!g_interface->displayMessage (*this, msg)) + if (!msg.empty()) + if (!g_interface->showMessage (*this, msg)) return; } @@ -832,7 +833,7 @@ // Interface std::list <Ypp::SelListener *> g_sel_listeners; -static bool g_transacting = false, g_autoSolver = true; +static bool g_transacting = false; void Ypp::addSelListener (Ypp::SelListener *listener) { g_sel_listeners.push_back (listener); } @@ -850,7 +851,6 @@ void Ypp::setInterface (Ypp::Interface *interface) { g_interface = interface; - runSolver(); // check problems at start } Ypp::Interface *Ypp::getInterface() { return g_interface; } @@ -938,6 +938,30 @@ bool Ypp::isSolverEnabled() { return g_autoSolver; } +bool Ypp::showPendingLicenses (Ypp::Selectable::Type type) +{ + const zypp::ResKind &kind = Selectable::asKind (type); + for (ZyppPool::const_iterator it = zyppPool().byKindBegin(kind); + it != zyppPool().byKindEnd(kind); it++) { + ZyppSelectable zsel = (*it); + switch (zsel->status()) { + case zypp::ui::S_Install: case zypp::ui::S_AutoInstall: + case zypp::ui::S_Update: case zypp::ui::S_AutoUpdate: + if (zsel->candidateObj()) { + std::string license = zsel->candidateObj()->licenseToConfirm(); + if (!license.empty()) + if (!zsel->hasLicenceConfirmed()) { + Selectable sel (zsel); + if (!g_interface->showLicense (sel, license)) + return false; + } + } + default: break; + } + } + return true; +} + void Ypp::startTransactions() { g_transacting = true; } Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.h (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/yzyppwrapper.h Tue Sep 14 15:48:38 2010 @@ -266,6 +266,7 @@ bool runSolver (bool force = false); // returns whether succesful void setEnableSolver (bool enabled); // true by default bool isSolverEnabled(); + bool showPendingLicenses (Ypp::Selectable::Type type); // temporarily suspends run-solver while installing/removing a few packages at a time // -- used by Ypp::List @@ -273,8 +274,8 @@ bool finishTransactions(); // returns return of runSolver() struct Interface { - virtual bool acceptLicense (Selectable &sel, const std::string &license) = 0; - virtual bool displayMessage (Selectable &sel, const std::string &message) = 0; + virtual bool showLicense (Selectable &sel, const std::string &license) = 0; + virtual bool showMessage (Selectable &sel, const std::string &message) = 0; // resolveProblems = false to cancel the action that had that effect virtual bool resolveProblems (const std::list <Problem *> &problems) = 0; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62490 - /tags/stable-2_21_68/gtk/
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:20:42 2010 New Revision: 62490 URL: http://svn.opensuse.org/viewcvs/yast?rev=62490&view=rev Log: Created tag stable-2_21_68 for gtk Added: tags/stable-2_21_68/gtk/ - copied from r62489, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62489 - /tags/stable-2_21_68/
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:20:17 2010 New Revision: 62489 URL: http://svn.opensuse.org/viewcvs/yast?rev=62489&view=rev Log: Created tag stable-2_21_68 Added: tags/stable-2_21_68/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62488 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:20:07 2010 New Revision: 62488 URL: http://svn.opensuse.org/viewcvs/yast?rev=62488&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62488&r1=62487&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Tue Sep 14 15:20:07 2010 @@ -1 +1 @@ -2.21.67 +2.21.68 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62488&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Tue Sep 14 15:20:07 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "67") +SET(VERSION_PATCH "68") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Tue Sep 14 15:20:07 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 14 14:18:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.68 +- sw_single: run solver at end, fixes bnc#620513. +- got rid of included FindGTK2.cmake module. + +------------------------------------------------------------------- Wed Jul 14 11:41:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.67 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62487 - in /trunk/gtk: CMakeLists.txt ChangeLog modules/ src/pkg/YGPackageSelector.cc src/pkg/yzyppwrapper.cc src/pkg/yzyppwrapper.h
by rpmcruz＠svn2.opensuse.org 14 Sep '10

14 Sep '10

Author: rpmcruz Date: Tue Sep 14 15:14:28 2010 New Revision: 62487 URL: http://svn.opensuse.org/viewcvs/yast?rev=62487&view=rev Log: * src/pkg/YGPackageSelector.cc: fix bug 637761: run solver one final time at apply. * src/pkg/yzyppwrapper.h/cc: added supporting methods. * CMakeLists.txt: remove included FindGTK2.cmake module. Removed: trunk/gtk/modules/ Modified: trunk/gtk/CMakeLists.txt trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/yzyppwrapper.cc trunk/gtk/src/pkg/yzyppwrapper.h Modified: trunk/gtk/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/CMakeLists.txt?rev=62487&r1=… ============================================================================== --- trunk/gtk/CMakeLists.txt (original) +++ trunk/gtk/CMakeLists.txt Tue Sep 14 15:14:28 2010 @@ -5,9 +5,6 @@ ## configure -# we bundle our own FindGTK2.cmake while it isn't shipped with cmake -set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/modules") - find_package (GTK2 REQUIRED gtk) find_package (Libyui REQUIRED) find_package (Zypp REQUIRED) Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62487&r1=62486… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Sep 14 15:14:28 2010 @@ -1,3 +1,12 @@ +2010-09-14 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: fix bug 637761: run + solver one final time at apply. + + * src/pkg/yzyppwrapper.h/cc: added supporting methods. + + * CMakeLists.txt: remove included FindGTK2.cmake module. + 2010-08-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * yast2-gtk.spec.in: add gdk-pixbuf-devel to Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Tue Sep 14 15:14:28 2010 @@ -266,13 +266,13 @@ return confirmed; } - virtual bool acceptLicense (Ypp::Selectable &sel, const std::string &license) + virtual bool showLicense (Ypp::Selectable &sel, const std::string &license) { return acceptText (sel, _("License Agreement"), _("Do you accept the terms of this license?"), license); } - virtual bool displayMessage (Ypp::Selectable &sel, const std::string &message) + virtual bool showMessage (Ypp::Selectable &sel, const std::string &message) { return acceptText (sel, _("Warning Message"), _("Install anyway"), message); } virtual bool resolveProblems (const std::list <Ypp::Problem *> &problems) @@ -699,6 +699,7 @@ dialog->setTitle (title); Ypp::setInterface (impl); + Ypp::runSolver(); // check dependencies at start impl->refreshQuery(); if (summaryMode()) popupChanges(); @@ -720,6 +721,11 @@ void YGPackageSelector::apply() { + if (!Ypp::runSolver()) return; // final dependencies check + if (onlineUpdateMode()) + if (!Ypp::showPendingLicenses (Ypp::Selectable::PATCH)) return; + if (!Ypp::showPendingLicenses (Ypp::Selectable::PACKAGE)) return; + if (Ypp::isModified()) { // confirm if (!onlineUpdateMode() && confirmUnsupported()) { if (!impl->confirmUnsupported()) Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Tue Sep 14 15:14:28 2010 @@ -17,6 +17,7 @@ #include <algorithm> static Ypp::Interface *g_interface = 0; +static bool g_autoSolver = true; // Repository @@ -322,14 +323,14 @@ default: { if (!m_sel->hasLicenceConfirmed()) { ZyppResObject obj = m_sel->candidateObj(); - if (obj) { + if (obj && g_interface && g_autoSolver) { const std::string &license = obj->licenseToConfirm(); - if (!license.empty() && g_interface) - if (!g_interface->acceptLicense (*this, license)) + if (!license.empty()) + if (!g_interface->showLicense (*this, license)) return; const std::string &msg = obj->insnotify(); - if (!msg.empty() && g_interface) - if (!g_interface->displayMessage (*this, msg)) + if (!msg.empty()) + if (!g_interface->showMessage (*this, msg)) return; } m_sel->setLicenceConfirmed(); @@ -379,11 +380,11 @@ _zyppPool().eraseRequestedLocale (m_locale); break; default: { - if (m_sel->hasCandidateObj()) { + if (m_sel->hasCandidateObj() && g_interface && g_autoSolver) { ZyppResObject obj = m_sel->candidateObj(); const std::string &msg = obj->delnotify(); - if (!msg.empty() && g_interface) - if (!g_interface->displayMessage (*this, msg)) + if (!msg.empty()) + if (!g_interface->showMessage (*this, msg)) return; } @@ -832,7 +833,7 @@ // Interface std::list <Ypp::SelListener *> g_sel_listeners; -static bool g_transacting = false, g_autoSolver = true; +static bool g_transacting = false; void Ypp::addSelListener (Ypp::SelListener *listener) { g_sel_listeners.push_back (listener); } @@ -850,7 +851,6 @@ void Ypp::setInterface (Ypp::Interface *interface) { g_interface = interface; - runSolver(); // check problems at start } Ypp::Interface *Ypp::getInterface() { return g_interface; } @@ -938,6 +938,30 @@ bool Ypp::isSolverEnabled() { return g_autoSolver; } +bool Ypp::showPendingLicenses (Ypp::Selectable::Type type) +{ + const zypp::ResKind &kind = Selectable::asKind (type); + for (ZyppPool::const_iterator it = zyppPool().byKindBegin(kind); + it != zyppPool().byKindEnd(kind); it++) { + ZyppSelectable zsel = (*it); + switch (zsel->status()) { + case zypp::ui::S_Install: case zypp::ui::S_AutoInstall: + case zypp::ui::S_Update: case zypp::ui::S_AutoUpdate: + if (zsel->candidateObj()) { + std::string license = zsel->candidateObj()->licenseToConfirm(); + if (!license.empty()) + if (!zsel->hasLicenceConfirmed()) { + Selectable sel (zsel); + if (!g_interface->showLicense (sel, license)) + return false; + } + } + default: break; + } + } + return true; +} + void Ypp::startTransactions() { g_transacting = true; } Modified: trunk/gtk/src/pkg/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.h?rev=6… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.h (original) +++ trunk/gtk/src/pkg/yzyppwrapper.h Tue Sep 14 15:14:28 2010 @@ -266,6 +266,7 @@ bool runSolver (bool force = false); // returns whether succesful void setEnableSolver (bool enabled); // true by default bool isSolverEnabled(); + bool showPendingLicenses (Ypp::Selectable::Type type); // temporarily suspends run-solver while installing/removing a few packages at a time // -- used by Ypp::List @@ -273,8 +274,8 @@ bool finishTransactions(); // returns return of runSolver() struct Interface { - virtual bool acceptLicense (Selectable &sel, const std::string &license) = 0; - virtual bool displayMessage (Selectable &sel, const std::string &message) = 0; + virtual bool showLicense (Selectable &sel, const std::string &license) = 0; + virtual bool showMessage (Selectable &sel, const std::string &message) = 0; // resolveProblems = false to cancel the action that had that effect virtual bool resolveProblems (const std::list <Problem *> &problems) = 0; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62486 - /tags/stable-2_20_0/users/
by jsuchome＠svn2.opensuse.org 13 Sep '10

13 Sep '10

Author: jsuchome Date: Mon Sep 13 15:41:41 2010 New Revision: 62486 URL: http://svn.opensuse.org/viewcvs/yast?rev=62486&view=rev Log: Created tag stable-2_20_0 for users Added: tags/stable-2_20_0/users/ - copied from r62485, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62485 - in /trunk/users: VERSION package/yast2-users.changes src/YaPI/USERS.pm
by jsuchome＠svn2.opensuse.org 13 Sep '10

13 Sep '10

Author: jsuchome Date: Mon Sep 13 15:40:49 2010 New Revision: 62485 URL: http://svn.opensuse.org/viewcvs/yast?rev=62485&view=rev Log: - YaPI: user_attributes also for system users (bnc#638907) - 2.20.0 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/YaPI/USERS.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=62485&r1=62484… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Mon Sep 13 15:40:49 2010 @@ -1 +1 @@ -2.19.14 +2.20.0 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Mon Sep 13 15:40:49 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 13 15:38:48 CEST 2010 - jsuchome(a)suse.cz + +- YaPI: user_attributes also for system users (bnc#638907) +- 2.20.0 + +------------------------------------------------------------------- Mon May 24 14:02:03 CEST 2010 - jsuchome(a)suse.cz - UMASK setting moved to /etc/default/useradd (bnc#606249) Modified: trunk/users/src/YaPI/USERS.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/YaPI/USERS.pm?rev=6248… ============================================================================== --- trunk/users/src/YaPI/USERS.pm (original) +++ trunk/users/src/YaPI/USERS.pm Mon Sep 13 15:40:49 2010 @@ -1314,7 +1314,7 @@ $ret = Users->GetUsers ($index, $type); # return only requested attributes... - if ($type eq "local" && $config->{"user_attributes"}) { + if (($type eq "local" || $type eq "system") && $config->{"user_attributes"}) { my $attrs = {}; foreach my $key (@{$config->{"user_attributes"}}) { $attrs->{$key} = 1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0