January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63075 - /tags/stable-2_20_10/yast2/
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 14:47:35 2011 New Revision: 63075 URL: http://svn.opensuse.org/viewcvs/yast?rev=63075&view=rev Log: Created tag stable-2_20_10 for yast2 Added: tags/stable-2_20_10/yast2/ (props changed) - copied from r63074, trunk/yast2/ -- 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] r63074 - in /trunk/yast2: VERSION library/packages/src/PackageKit.ycp library/packages/src/PackageLock.ycp package/yast2.changes
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 14:47:24 2011 New Revision: 63074 URL: http://svn.opensuse.org/viewcvs/yast?rev=63074&view=rev Log: - check PackageKit status, suggest to quit the daemon if it is running (bnc#659522) - 2.20.10 Added: trunk/yast2/library/packages/src/PackageKit.ycp Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageLock.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63074&r1=63073… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Jan 4 14:47:24 2011 @@ -1 +1 @@ -2.20.9 +2.20.10 Added: trunk/yast2/library/packages/src/PackageKit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageKit.ycp (added) +++ trunk/yast2/library/packages/src/PackageKit.ycp Tue Jan 4 14:47:24 2011 @@ -0,0 +1,63 @@ +/** + * File: modules/PackageKit.ycp + * Package: yast2 + * Summary: PackageKit access functions + * Authors: Ladislav Slezak <lslezak(a)suse.cz> + * + * $Id:$ + * + * This is a wrrapper around PackageKit DBus interface. + */ + +{ + module "PackageKit"; + + /** + * Check whether PackageKit daemon is running + * @return boolean return true if PackageKit is currently running + */ + global boolean IsRunning() + { + string cmd = "dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply " + + "--reply-timeout=200 / org.freedesktop.DBus.NameHasOwner string:org.freedesktop.PackageKit"; + y2milestone("Checking PackageKit status: %1", cmd); + + map out = (map)SCR::Execute(.target.bash_output, cmd); + + boolean ret = false; + list<string> lines = splitstring(out["stdout"]:"", "\n"); + + foreach(string line, lines, + { + if (regexpmatch(line, "boolean.*true")) + { + ret = true; + } + } + ); + + y2milestone("PackageKit is running: %1", ret); + + return ret; + } + + /** + * Ask the PackageKit daemon to quit + * If a transaction is in progress the daemon will not quit, + * you have to check the current status using isRunning() function. + */ + global void SuggestQuit() + { + string cmd = "dbus-send --system --dest=org.freedesktop.PackageKit --type=method_call " + + "/org/freedesktop/PackageKit org.freedesktop.PackageKit.SuggestDaemonQuit"; + y2milestone("Asking PackageKit to quit: %1", cmd); + + integer ret = (integer)SCR::Execute(.target.bash, cmd); + + if (ret != 0) + { + y2error("dbus-send failed!"); + } + } + +} Modified: trunk/yast2/library/packages/src/PackageLock.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageLock.ycp (original) +++ trunk/yast2/library/packages/src/PackageLock.ycp Tue Jan 4 14:47:24 2011 @@ -16,9 +16,45 @@ import "Popup"; import "Label"; +import "PackageKit"; boolean have_lock = nil; boolean aborted = false; +// display a different message in the first PackageKit quit confirmation +boolean packagekit_asked = false; + +/** + * Ask whether to quit PackageKit if it is running + * @return boolean true if PackageKit was asked to quit + */ +boolean AskPackageKit() +{ + boolean ret = false; + + if (PackageKit::IsRunning()) + { + // ask to send quit signal to PackageKit + string msg = packagekit_asked ? + _("PackageKit is still running (probably busy). +Ask PackageKit to quit again?") + : + _("PackageKit is blocking software management. +This happens when the updater applet or another software management +application is running. + +Ask PackageKit to quit?"); + + packagekit_asked = true; + + if (Popup::YesNo(msg)) + { + PackageKit::SuggestQuit(); + ret = true; + } + } + + return ret; +} /** * Tries to acquire the packager (zypp) lock. @@ -40,6 +76,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + try_again = (Popup::AnyQuestion ( // TRANSLATORS: a popup headline _("Accessing the Software Management Failed"), @@ -83,6 +126,13 @@ if (have_lock == true) break; if (have_lock != true) { + if (AskPackageKit()) + { + // let the PackageKit quit before retrying + sleep(2000); + continue; + } + if (show_continue_button) { symbol ret = Popup::AnyQuestion3( Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 4 14:47:24 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 4 13:42:54 UTC 2011 - lslezak(a)suse.cz + +- check PackageKit status, suggest to quit the daemon if it is + running (bnc#659522) +- 2.20.10 + +------------------------------------------------------------------- Mon Jan 3 17:25:36 UTC 2011 - lslezak(a)suse.cz - fixed VLAN config type detection (wrong regexp) -- 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] r63073 - /tags/stable-2_20_0/mail/
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 12:19:58 2011 New Revision: 63073 URL: http://svn.opensuse.org/viewcvs/yast?rev=63073&view=rev Log: Created tag stable-2_20_0 for mail Added: tags/stable-2_20_0/mail/ - copied from r63072, trunk/mail/ -- 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] r63072 - in /trunk/mail: VERSION package/yast2-mail.changes src/Mail.ycp
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 12:19:49 2011 New Revision: 63072 URL: http://svn.opensuse.org/viewcvs/yast?rev=63072&view=rev Log: - fixed syntax error - 2.20.0 Modified: trunk/mail/VERSION trunk/mail/package/yast2-mail.changes trunk/mail/src/Mail.ycp Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=63072&r1=63071&… ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Tue Jan 4 12:19:49 2011 @@ -1 +1 @@ -2.18.6 +2.20.0 Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Tue Jan 4 12:19:49 2011 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 4 11:17:20 UTC 2011 - lslezak(a)suse.cz + +- fixed syntax error +- 2.20.0 + ------------------------------------------------------------------ Thu Nov 25 13:42:17 CET 2010 - varkoly(a)suse.de Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=63072&r1=6… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Tue Jan 4 12:19:49 2011 @@ -311,8 +311,8 @@ } if( newcyrus ) { - Service::Enable("cyrus") - Service::Start("cyrus") + Service::Enable("cyrus"); + Service::Start("cyrus"); } return message; } -- 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] r63071 - /tags/stable-2_20_3/autoinstallation/
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 12:11:26 2011 New Revision: 63071 URL: http://svn.opensuse.org/viewcvs/yast?rev=63071&view=rev Log: Created tag stable-2_20_3 for autoinstallation Added: tags/stable-2_20_3/autoinstallation/ - copied from r63070, trunk/autoinstallation/ -- 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] r63070 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/include/io.ycp
by lslezak＠svn2.opensuse.org 04 Jan '11

04 Jan '11

Author: lslezak Date: Tue Jan 4 12:11:15 2011 New Revision: 63070 URL: http://svn.opensuse.org/viewcvs/yast?rev=63070&view=rev Log: - fixed build (wrong mount call params) - 2.20.3 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=630… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Tue Jan 4 12:11:15 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jan 4 12:11:15 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 4 11:04:33 UTC 2011 - lslezak(a)suse.cz + +- fixed build (wrong mount call params) +- 2.20.3 + +------------------------------------------------------------------- Wed Nov 24 17:19:09 CET 2010 - ug(a)suse.de - clone devices by-path on s390 (bnc#591603) Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Tue Jan 4 12:11:15 2011 @@ -313,7 +313,7 @@ }); y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); if( ! already_mounted && - !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host), + !(boolean)SCR::Execute(.target.mount, [sformat("/dev/%1", Host), mount_point], "-o noatime") ) { y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host)); GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host)); -- 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] r63069 - /tags/stable-2_20_0/core/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 22:25:54 2011 New Revision: 63069 URL: http://svn.opensuse.org/viewcvs/yast?rev=63069&view=rev Log: Created tag stable-2_20_0 for core Added: tags/stable-2_20_0/core/ (props changed) - copied from r63068, trunk/core/ -- 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] r63068 - in /trunk/core: VERSION package/yast2-core.changes yast2-core.spec.in
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 22:25:40 2011 New Revision: 63068 URL: http://svn.opensuse.org/viewcvs/yast?rev=63068&view=rev Log: - fixed packaging in openSUSE-11.4 (perl files) - 2.20.0 Modified: trunk/core/VERSION trunk/core/package/yast2-core.changes trunk/core/yast2-core.spec.in Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=63068&r1=63067&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon Jan 3 22:25:40 2011 @@ -1 +1 @@ -2.19.3 +2.20.0 Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Jan 3 22:25:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 3 20:53:16 UTC 2011 - lslezak(a)suse.cz + +- fixed packaging in openSUSE-11.4 (perl files) +- 2.20.0 + +------------------------------------------------------------------- Tue Aug 10 13:28:57 CEST 2010 - mvidner(a)suse.cz - Enable input buffering for YCP include files (bnc#629882). Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=6306… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Mon Jan 3 22:25:40 2011 @@ -112,9 +112,12 @@ %{perl_vendorlib}/ycp.pm %dir %{perl_vendorlib}/YaST %{perl_vendorlib}/YaST/SCRAgent.pm + +%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 # .packlist %{perl_vendorarch}/auto/ycp /var/adm/perl-modules/%name +%endif %files devel %defattr(-,root,root) -- 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] r63067 - /tags/stable-2_20_9/yast2/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 19:29:53 2011 New Revision: 63067 URL: http://svn.opensuse.org/viewcvs/yast?rev=63067&view=rev Log: Created tag stable-2_20_9 for yast2 Added: tags/stable-2_20_9/yast2/ (props changed) - copied from r63066, trunk/yast2/ -- 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] r63066 - in /trunk/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by lslezak＠svn2.opensuse.org 03 Jan '11

03 Jan '11

Author: lslezak Date: Mon Jan 3 18:30:02 2011 New Revision: 63066 URL: http://svn.opensuse.org/viewcvs/yast?rev=63066&view=rev Log: - fixed VLAN config type detection (wrong regexp) - 2.20.9 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63066&r1=63065… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Jan 3 18:30:02 2011 @@ -1 +1 @@ -2.20.8 +2.20.9 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Mon Jan 3 18:30:02 2011 @@ -183,7 +183,7 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); // test if this is VLAN (ethX.vlanid) - if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\.[[:digit:]]+$")) return "vlan"; + if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out Mon Jan 3 18:30:02 2011 @@ -9,6 +9,8 @@ Dump ifcfg-lo, type: lo Dump ifcfg-eth0#1, type: eth Dump ifcfg-eth1#20, type: eth +Dump ifcfg-eth0.1, type: vlan +Dump ifcfg-eth1.20, type: vlan Dump ifcfg-eth-pcmcia-0#3, type: eth Dump ifcfg-eth-usb-1#0, type: eth Dump ifcfg-tr-pcmcia-2#432, type: tr Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/… ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp Mon Jan 3 18:30:02 2011 @@ -20,6 +20,8 @@ "lo", "eth0#1", "eth1#20", + "eth0.1", + "eth1.20", "eth-pcmcia-0#3", "eth-usb-1#0", "tr-pcmcia-2#432", Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jan 3 18:30:02 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 3 17:25:36 UTC 2011 - lslezak(a)suse.cz + +- fixed VLAN config type detection (wrong regexp) +- 2.20.9 + +------------------------------------------------------------------- Mon Jan 3 16:49:18 UTC 2011 - lslezak(a)suse.cz - don't abort when package checksum verification failes, ask to -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0