July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64943 - in /trunk/vm: package/yast2-vm.changes src/relocation-server.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:22:55 2011 New Revision: 64943 URL: http://svn.opensuse.org/viewcvs/yast?rev=64943&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/vm/package/yast2-vm.changes trunk/vm/src/relocation-server.desktop Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Fri Jul 22 15:22:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:21:54 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Wed Jun 29 13:55:52 CST 2011 - lidongyang(a)novell.com - bnc#702106 - Remove 32-bit "Install Hypervisor and Tools" from Modified: trunk/vm/src/relocation-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/relocation-server.desktop… ============================================================================== --- trunk/vm/src/relocation-server.desktop (original) +++ trunk/vm/src/relocation-server.desktop Fri Jul 22 15:22:55 2011 @@ -21,5 +21,4 @@ Name=Relocation Server Configuration GenericName=relocation-server -X-KDE-SubstituteUID=true StartupNotify=true -- 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] r64942 - in /trunk/ipsec: package/yast2-ipsec.changes src/ipsec.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:12:41 2011 New Revision: 64942 URL: http://svn.opensuse.org/viewcvs/yast?rev=64942&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/ipsec/package/yast2-ipsec.changes trunk/ipsec/src/ipsec.desktop Modified: trunk/ipsec/package/yast2-ipsec.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/package/yast2-ipsec.change… ============================================================================== --- trunk/ipsec/package/yast2-ipsec.changes (original) +++ trunk/ipsec/package/yast2-ipsec.changes Fri Jul 22 15:12:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:11:57 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/ipsec/src/ipsec.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/src/ipsec.desktop?rev=6494… ============================================================================== --- trunk/ipsec/src/ipsec.desktop (original) +++ trunk/ipsec/src/ipsec.desktop Fri Jul 22 15:12:41 2011 @@ -21,5 +21,4 @@ Name=VPN GenericName=Configure IPsec virtual private networks (VPNs) -X-KDE-SubstituteUID=true StartupNotify=true -- 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] r64941 - in /trunk/packager: package/yast2-packager.changes src/config/checkmedia.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:10:31 2011 New Revision: 64941 URL: http://svn.opensuse.org/viewcvs/yast?rev=64941&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/config/checkmedia.desktop Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Jul 22 15:10:31 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:09:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Jul 1 07:19:15 UTC 2011 - lslezak(a)suse.cz - fixed a typo in help text (bnc#703199) Modified: trunk/packager/src/config/checkmedia.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/checkmedia.d… ============================================================================== --- trunk/packager/src/config/checkmedia.desktop (original) +++ trunk/packager/src/config/checkmedia.desktop Fri Jul 22 15:10:31 2011 @@ -21,5 +21,4 @@ Name=Media Check GenericName=Verify CD and DVD media integrity -X-KDE-SubstituteUID=true StartupNotify=true -- 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] r64940 - in /trunk/ldap-client: package/yast2-ldap-client.changes src/ldap_browser.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:08:25 2011 New Revision: 64940 URL: http://svn.opensuse.org/viewcvs/yast?rev=64940&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ldap_browser.desktop Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jul 22 15:08:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:07:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Jul 15 11:56:55 CEST 2011 - jsuchome(a)suse.cz - correctly realize that SSSD was selected (bnc#705118) Modified: trunk/ldap-client/src/ldap_browser.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.des… ============================================================================== --- trunk/ldap-client/src/ldap_browser.desktop (original) +++ trunk/ldap-client/src/ldap_browser.desktop Fri Jul 22 15:08:25 2011 @@ -21,5 +21,4 @@ Name=LDAP Browser GenericName=Browse the LDAP repository -X-KDE-SubstituteUID=true StartupNotify=true -- 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] r64939 - in /trunk/firstboot: package/yast2-firstboot.changes src/data/firstboot.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:06:34 2011 New Revision: 64939 URL: http://svn.opensuse.org/viewcvs/yast?rev=64939&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) Modified: trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/data/firstboot.desktop Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Fri Jul 22 15:06:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:05:22 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from desktop file + (bnc#540627) + +------------------------------------------------------------------- Fri Feb 18 11:28:57 CET 2011 - jsuchome(a)suse.cz - call stop_unicode before kbd restart (bnc#665504) Modified: trunk/firstboot/src/data/firstboot.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/firstboot.des… ============================================================================== --- trunk/firstboot/src/data/firstboot.desktop (original) +++ trunk/firstboot/src/data/firstboot.desktop Fri Jul 22 15:06:34 2011 @@ -22,5 +22,4 @@ Name=Firstboot Configuration GenericName=Enable or disable starting Firstboot sequence -X-KDE-SubstituteUID=true StartupNotify=true -- 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] r64938 - in /trunk/installation: package/yast2-installation.changes src/config/deploy_image.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 15:04:09 2011 New Revision: 64938 URL: http://svn.opensuse.org/viewcvs/yast?rev=64938&view=rev Log: - Removed obsoleted X-KDE-SubstituteUID from deploy_image.desktop (bnc#540627) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/config/deploy_image.desktop Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jul 22 15:04:09 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 15:00:30 CEST 2011 - locilka(a)suse.cz + +- Removed obsoleted X-KDE-SubstituteUID from deploy_image.desktop + (bnc#540627) + +------------------------------------------------------------------- Tue Jul 12 15:34:38 CEST 2011 - jsuchome(a)suse.cz - Show Xen Virtualization Host Server Installation scenario Modified: trunk/installation/src/config/deploy_image.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/deploy_i… ============================================================================== --- trunk/installation/src/config/deploy_image.desktop (original) +++ trunk/installation/src/config/deploy_image.desktop Fri Jul 22 15:04:09 2011 @@ -24,5 +24,5 @@ Name=Image deployment GenericName=Configure image deployment -X-KDE-SubstituteUID=true + StartupNotify=true -- 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] r64937 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/kdeymp.desktop
by locilka＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: locilka Date: Fri Jul 22 14:52:22 2011 New Revision: 64937 URL: http://svn.opensuse.org/viewcvs/yast?rev=64937&view=rev Log: - removed X-KDE-SubstituteUID from the desktop file and replaced with X-SuSE-YaST-RootOnly (bnc#540627) Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/kdeymp.desktop Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Fri Jul 22 14:52:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:48:20 CEST 2011 - locilka(a)suse.cz + +- removed X-KDE-SubstituteUID from the desktop file and replaced + with X-SuSE-YaST-RootOnly (bnc#540627) + +------------------------------------------------------------------- Fri Oct 15 11:34:00 UTC 2010 - lslezak(a)suse.cz - added missing slidshow initialization after manual conflict Modified: trunk/metapackage/src/kdeymp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/kdeymp.desktop?r… ============================================================================== --- trunk/metapackage/src/kdeymp.desktop (original) +++ trunk/metapackage/src/kdeymp.desktop Fri Jul 22 14:52:22 2011 @@ -1,4 +1,5 @@ [Desktop Entry] +X-SuSE-YaST-RootOnly=false X-SuSE-translate=false Exec=/sbin/yast2 MetaPackageHandler %U InitialPreference=2 @@ -7,6 +8,4 @@ StartupNotify=false Terminal=false Type=Application -X-KDE-SubstituteUID=false X-KDE-StartupNotify=false - -- 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] r64936 - in /trunk/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: aschnell Date: Fri Jul 22 14:47:36 2011 New Revision: 64936 URL: http://svn.opensuse.org/viewcvs/yast?rev=64936&view=rev Log: - fixed diag mode setting (bnc #591037) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=64936&r1=64935&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Fri Jul 22 14:47:36 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Jul 22 14:47:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:41:14 CEST 2011 - aschnell(a)suse.de + +- fixed diag mode setting (bnc #591037) +- 2.17.19 + +------------------------------------------------------------------- Tue Jun 21 12:29:58 EDT 2011 - aschnell(a)suse.de - use ButtonBox for correct button order (bnc #701269) Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=64… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Jul 22 14:47:36 2011 @@ -311,7 +311,8 @@ * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer */ -define symbol DASDDialog() { +symbol DASDDialog() +{ DisplayDASDDialog (); ReloadDASDDialog (); any ret = nil; @@ -320,8 +321,7 @@ { ret = UI::UserInput(); - integer selected = (integer) - UI::QueryWidget (`id (`table), `CurrentItem); + integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); if (ret == `filter) { ReloadDASDDialog (); @@ -391,17 +391,21 @@ } else if (ret == `diag_on) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -411,17 +415,21 @@ } else if (ret == `diag_off) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); -- 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] r64935 - in /branches/SuSE-Code-11-SP2-Branch/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: aschnell Date: Fri Jul 22 14:46:26 2011 New Revision: 64935 URL: http://svn.opensuse.org/viewcvs/yast?rev=64935&view=rev Log: - fixed diag mode setting (bnc #591037) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Fri Jul 22 14:46:26 2011 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Fri Jul 22 14:46:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:41:14 CEST 2011 - aschnell(a)suse.de + +- fixed diag mode setting (bnc #591037) +- 2.17.19 + +------------------------------------------------------------------- Mon Jul 18 10:30:40 CEST 2011 - aschnell(a)suse.de - include fix for bnc #591603 Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp Fri Jul 22 14:46:26 2011 @@ -311,7 +311,8 @@ * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer */ -define symbol DASDDialog() { +symbol DASDDialog() +{ DisplayDASDDialog (); ReloadDASDDialog (); any ret = nil; @@ -320,8 +321,7 @@ { ret = UI::UserInput(); - integer selected = (integer) - UI::QueryWidget (`id (`table), `CurrentItem); + integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); if (ret == `filter) { ReloadDASDDialog (); @@ -391,17 +391,21 @@ } else if (ret == `diag_on) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -411,17 +415,21 @@ } else if (ret == `diag_off) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); Modified: branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Fri Jul 22 14:46:26 2011 @@ -2,7 +2,7 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 +Requires: yast2 yast2-core >= 2.17.37 %ifarch s390 s390x Requires: s390-tools %endif -- 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] r64934 - in /trunk/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: ug Date: Fri Jul 22 09:59:36 2011 New Revision: 64934 URL: http://svn.opensuse.org/viewcvs/yast?rev=64934&view=rev Log: passing a boolean to an ask-script did not work Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp 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 Fri Jul 22 09:59:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 22 09:58:54 CEST 2011 - ug(a)suse.de + +- passing a type=boolean to an ask-script via $VAL did not work + +------------------------------------------------------------------- Mon Jul 18 08:36:53 CEST 2011 - jsrain(a)suse.cz - fixed typo (bnc#702662) Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Fri Jul 22 09:59:36 2011 @@ -266,11 +266,15 @@ SCR::Execute (.target.mkdir, current_logdir); } string executionString = ""; - if( script["environment"]:false ) + if( script["environment"]:false ) { + if( ask["type"]:"string" == "boolean" ) { + val = sformat("%1", ( (boolean)val ? "true" : "false" )); + } executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape((string)val)); - else + } else { executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName ); + } y2milestone("Script Execution command: %1", executionString ); runAgain = runAgain + (integer)SCR::Execute (.target.bash, executionString); if( script["rerun_on_error"]:false == false ) -- 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] r64933 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 22 Jul '11

22 Jul '11

Author: ug Date: Fri Jul 22 09:56:36 2011 New Revision: 64933 URL: http://svn.opensuse.org/viewcvs/yast?rev=64933&view=rev Log: passing a boolean to an ask-script did not work Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Fri Jul 22 09:56:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 22 09:54:01 CEST 2011 - ug(a)suse.de + +- passing a type=boolean to an ask-script via $VAL did not work + +------------------------------------------------------------------- Tue Jul 19 14:35:45 CEST 2011 - ug(a)suse.de - fixed logging for modules that use a list as data structure Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/dialogs/ask.ycp Fri Jul 22 09:56:36 2011 @@ -266,11 +266,15 @@ SCR::Execute (.target.mkdir, current_logdir); } string executionString = ""; - if( script["environment"]:false ) + if( script["environment"]:false ) { + if( ask["type"]:"string" == "boolean" ) { + val = sformat("%1", ( (boolean)val ? "true" : "false" )); + } executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape((string)val)); - else + } else { executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName ); + } y2milestone("Script Execution command: %1", executionString ); runAgain = runAgain + (integer)SCR::Execute (.target.bash, executionString); if( script["rerun_on_error"]:false == false ) -- 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] r64932 - /tags/stable-2_21_5/yast2/
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 16:29:40 2011 New Revision: 64932 URL: http://svn.opensuse.org/viewcvs/yast?rev=64932&view=rev Log: Created tag stable-2_21_5 for yast2 Added: tags/stable-2_21_5/yast2/ (props changed) - copied from r64931, 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] r64931 - in /trunk/yast2: VERSION library/network/src/CWMFirewallInterfaces.ycp library/network/src/SuSEFirewall.ycp package/yast2.changes
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 15:24:21 2011 New Revision: 64931 URL: http://svn.opensuse.org/viewcvs/yast?rev=64931&view=rev Log: - Fixed SuSEfirewall2 config library: By default any unassigned network interface is automatically assigned to the external firewall zone (bnc#547309). - Fixed CWM library for opening ports in firewall not to list any empty strings returned by network module, just interface names (bnc#547309). - 2.21.5 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64931&r1=64930… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 21 15:24:21 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFir… ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Jul 21 15:24:21 2011 @@ -33,6 +33,7 @@ import "SuSEFirewall"; import "Report"; import "Stage"; +import "String"; // used only for (Mode::installation() || Mode::update()) import "SuSEFirewallProposal"; @@ -139,7 +140,7 @@ y2milestone("Reading NetworkInterfaces..."); NetworkInterfaces::Read (); } - all_interfaces = NetworkInterfaces::List (""); + all_interfaces = String::NonEmpty (NetworkInterfaces::List ("")); all_interfaces = filter (string i, all_interfaces, { return i != "lo"; }); @@ -238,7 +239,7 @@ groups = add (groups, SuSEFirewall::special_all_interface_zone); } - groups = toset (groups); + groups = String::NonEmpty (toset (groups)); groups = filter (string g, groups, { return g != nil; }); @@ -491,7 +492,6 @@ } } - // list<string> firewall_ifaces = toset (Selected2Opened (ifaces, nm_ifaces_have_to_be_supported)); list<string> firewall_ifaces = toset (Selected2Opened (ifaces, false)); y2milestone("firewall_ifaces: %1", firewall_ifaces); Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Thu Jul 21 15:24:21 2011 @@ -240,11 +240,14 @@ /** * Function returns whether the feature 'any' network interface is supported in the * firewall configuration. The string 'any' must be in the 'EXT' zone. + * Updated: Currently returns only 'true' as every unasigned interface is + * automatically assigned to the EXT zone by SuSEfirewall2. * * @return boolean is_supported whether the feature is supported or not */ global boolean IsAnyNetworkInterfaceSupported () { - return contains(GetSpecialInterfacesInZone(special_all_interface_zone), special_all_interface_string); + // Currently unasigned interfaces belong to the EXT zone by dafault + return true; } /** 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 Thu Jul 21 15:24:21 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jul 21 15:15:51 CEST 2011 - locilka(a)suse.cz + +- Fixed SuSEfirewall2 config library: By default any unassigned + network interface is automatically assigned to the external + firewall zone (bnc#547309). +- Fixed CWM library for opening ports in firewall not to list any + empty strings returned by network module, just interface names + (bnc#547309). +- 2.21.5 + +------------------------------------------------------------------- Mon Jul 18 08:26:12 CEST 2011 - jsrain(a)suse.cz - fixed typo (bnc#702662) -- 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] r64930 - /tags/branch-Code-11-SP2-2_17_6/fcoe-client/
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:40:20 2011 New Revision: 64930 URL: http://svn.opensuse.org/viewcvs/yast?rev=64930&view=rev Log: Created tag branch-Code-11-SP2-2_17_6 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_6/fcoe-client/ - copied from r64929, branches/SuSE-Code-11-SP2-Branch/fcoe-client/ -- 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] r64929 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:35:05 2011 New Revision: 64929 URL: http://svn.opensuse.org/viewcvs/yast?rev=64929&view=rev Log: check return value from removing interface and add error popup Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Jul 21 14:35:05 2011 @@ -377,8 +377,8 @@ y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - // store command to be able to revert the creation of FCoE VLAN interface in case of abort - // TODO: is this also OK if only 'fipvlan -s <interface>' is called? + // store command to be able to revert the creation of FCoE VLAN interface in case of 'Abort' + // (also if only 'fipvlan -s <interface>' is called) FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); if ( create_ifcfg ) { @@ -416,41 +416,50 @@ { map card = FcoeClient::GetCurrentNetworkCard(); map output = $[]; + string command = ""; // headline of a popup boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), // question to the user: really remove FCoE VLAN interface sformat( _("Do you really want to remove the VLAN device %1? -Please note: The device is not enabled again on 'Abort'."), card["fcoe_vlan"]:"" ) ); +Please note: The device won't be restored on 'Abort'."), card["fcoe_vlan"]:"" ) ); if ( ret == true ) { y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); - string rm_interface = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; - y2milestone( "Calling %1", rm_interface ); - output = (map)SCR::Execute( .target.bash_output, rm_interface ); - y2milestone( "Output: %1", output ); - - string rm_cfg = sformat( "rm %1", card["cfg_file"]:"" ); - y2milestone( "Calling %1", rm_cfg ); - output = (map)SCR::Execute( .target.bash_output, rm_cfg ); + command = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); - // set new values in global map network_interfaces - card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; - card["fcoe_enable"] = ""; - card["dcb_required"] = ""; - card["cfg_file"] = ""; - FcoeClient::SetModified( true ); + if ( output["exit"]:255 == 0 ) + { + command = sformat( "rm %1", card["cfg_file"]:"" ); + y2milestone( "Calling %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + // set new values in global map network_interfaces + card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; + card["fcoe_enable"] = ""; + card["dcb_required"] = ""; + card["cfg_file"] = ""; + FcoeClient::SetModified( true ); - FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); - y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); - // replace values in table - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); - UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); - AdjustButtons(); + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); + AdjustButtons(); + } + else + { + Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); + y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); + } } } -- 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] r64928 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 14:11:56 2011 New Revision: 64928 URL: http://svn.opensuse.org/viewcvs/yast?rev=64928&view=rev Log: 2.17.6 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Thu Jul 21 14:11:56 2011 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Thu Jul 21 14:11:56 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 21 14:09:17 CEST 2011 - gs(a)suse.de + +- Write configuration for FCoE interfaces to /etc/sysconfig/network + (effective for installed system), bug-fix for starting services + at boot, add possibility to remove devices +- V 2.17.6 + +------------------------------------------------------------------- Wed Jul 13 14:13:18 CEST 2011 - gs(a)suse.de - Bug-fix for AutoYaST support (start FCoE on all capable -- 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] r64927 - /tags/stable-2_20_13/network/
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 14:05:30 2011 New Revision: 64927 URL: http://svn.opensuse.org/viewcvs/yast?rev=64927&view=rev Log: Created tag stable-2_20_13 for network Added: tags/stable-2_20_13/network/ (props changed) - copied from r64926, trunk/network/ -- 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] r64926 - /trunk/devtools/devtools/data/YaST2.dict.txt
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 14:05:08 2011 New Revision: 64926 URL: http://svn.opensuse.org/viewcvs/yast?rev=64926&view=rev Log: Added some more known words to the spellcheck whitelist. Modified: trunk/devtools/devtools/data/YaST2.dict.txt Modified: trunk/devtools/devtools/data/YaST2.dict.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/data/YaST2.dic… ============================================================================== --- trunk/devtools/devtools/data/YaST2.dict.txt (original) +++ trunk/devtools/devtools/data/YaST2.dict.txt Thu Jul 21 14:05:08 2011 @@ -2,12 +2,17 @@ ACLs ADSL AMAVIS +AOL +AP +AVM AutoYaST BIOS BOOTP Bacula Belarus Bluetooth +BusID +CAPI CDs CGI CNAME @@ -23,11 +28,16 @@ DVB DVD DVDs +EAP +ESCON +ESSID +FICON FireWire Firefox GDM GNOME GPG +GTC Georgia GnuPG HTTPS @@ -35,6 +45,7 @@ IMAP IMAPS IP +IPA IPP IPs IPsec @@ -44,6 +55,7 @@ ISA ISDN ISP +IUCV IrDA JFS KDE @@ -52,11 +64,14 @@ Kb Kerberos Konqueror +LCS LDAP LDAPS LVM Linuxrc MBR +MSCHAPv1 +MSCHAPv2 MSN MTU MX @@ -64,16 +79,26 @@ Mozilla MySQL NFS +NFSroot +NIC NIS NS NetBIOS +NetControl +Netelligent NetworkManager Novell +OSA OpenGL OpenLDAP +PBX PCI +PEAP PHP PPC +PPPoATM +PPPoE +PPTP PTR Perl RSA @@ -96,6 +121,7 @@ SuSE SuSEconfig SuSEfirewall +SyncPPP TLS TSIG TSL @@ -109,24 +135,36 @@ Uninstall Uninstalled Uzbekistan +VCI VESA VLAN VMWare VNC +VPI +VPN WAP WEP WLAN +WPA +WPA-EAP +WPA-PSK WebDAV +Wi-Fi XFS XFree +Xen YaST ZENworks ZFCP ZMD +addlink +applet autodetect autodetected autodetection autoinstallation +blah +bmac bootable chipset chroot @@ -134,24 +172,45 @@ cron cyrus defragmentation +dhcp +dhcpcd +dmesg +drdsl +eth0 +eth1 ethernet fetchmail firewalled +foo framebuffer fstab +hipster hotplug hotpluggable hotplugging +hwinfo +iBFT iSCSI +iSeries +ifconfig +ifdown +ifup init initrd +ipppd +iscsi +isdnctrl +knetworkmanager +lan lighttpd loopback masqueraded +modprobe multiboot ncurses netconfig netmask +nfs openSUSE passphrase passwd @@ -162,11 +221,13 @@ preshared procmail pureftpd +rcnetwork reinstall reinstallation runlevel runlevels smb +smpppd ssh sshd strace @@ -176,6 +237,8 @@ subdomains sysconfig syslog +ttyS0 +ttyS1 udev umount uncheck @@ -190,3 +253,4 @@ xntp yast2 ypbind +zeroconf -- 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] r64925 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 13:58:46 2011 New Revision: 64925 URL: http://svn.opensuse.org/viewcvs/yast?rev=64925&view=rev Log: Remove button and functionality to remove interfaces added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Jul 21 13:58:46 2011 @@ -52,6 +52,8 @@ * @return true if users aborts installation */ boolean ReallyAbort() { + y2milestone( "Aborting FCoE configuration" ); + // revert start of 'fcoe' or 'lldpad' if ( FcoeClient::fcoe_started ) { @@ -113,14 +115,12 @@ return ret ? `next : `abort; } -// TODO - check whether a 'validate' is required - /** * Init **/ void InitServicesDialog (string id) { y2milestone( "Init services dialog" ); - y2milestone( "Modified: %1", FcoeClient::Modified() ); + y2milestone( "Data modified: %1", FcoeClient::Modified() ); map status_map = FcoeClient::GetStartStatus(); if ( status_map["fcoe"]:false == true ) @@ -158,16 +158,19 @@ { UI::ChangeWidget( `id(`edit), `Enabled, false ); UI::ChangeWidget( `id(`create), `Enabled, true ); + UI::ChangeWidget( `id(`remove), `Enabled, false ); } else if ( card["fcoe_vlan"]:"" == FcoeClient::NOT_AVAILABLE ) { UI::ChangeWidget( `id(`edit), `Enabled, false ); - UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`remove), `Enabled, false ); } else { UI::ChangeWidget( `id(`edit), `Enabled, true ); UI::ChangeWidget( `id(`create), `Enabled, false ); + UI::ChangeWidget( `id(`remove), `Enabled, true ); } } @@ -409,6 +412,47 @@ UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["DCB_REQUIRED"]:"" ); AdjustButtons(); } + else if ( action == `remove ) + { + map card = FcoeClient::GetCurrentNetworkCard(); + map output = $[]; + + // headline of a popup + boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), + // question to the user: really remove FCoE VLAN interface + sformat( _("Do you really want to remove the VLAN device %1? +Please note: The device is not enabled again on 'Abort'."), card["fcoe_vlan"]:"" ) ); + if ( ret == true ) + { + y2milestone( "Removing %1", card["fcoe_vlan"]:"" ); + + string rm_interface = sformat( "vconfig rem %1", card["fcoe_vlan"]:"") ; + y2milestone( "Calling %1", rm_interface ); + output = (map)SCR::Execute( .target.bash_output, rm_interface ); + y2milestone( "Output: %1", output ); + + string rm_cfg = sformat( "rm %1", card["cfg_file"]:"" ); + y2milestone( "Calling %1", rm_cfg ); + output = (map)SCR::Execute( .target.bash_output, rm_cfg ); + y2milestone( "Output: %1", output ); + + // set new values in global map network_interfaces + card["fcoe_vlan"] = FcoeClient::NOT_CONFIGURED; + card["fcoe_enable"] = ""; + card["dcb_required"] = ""; + card["cfg_file"] = ""; + FcoeClient::SetModified( true ); + + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + + // replace values in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), card["fcoe_vlan"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 3), card["fcoe_enable"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), card["dcb_required"]:"" ); + AdjustButtons(); + } + } return nil; } @@ -436,12 +480,12 @@ boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); FcoeClient::SetStartStatus( "fcoe", fcoe_auto ); - y2milestone ("Setting auto start of service 'fcoe' to: %1", (fcoe_auto?"true":"false") ); + y2milestone ("Setting auto start of service 'fcoe' to: %1", fcoe_auto ); boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); FcoeClient::SetStartStatus( "lldpad", lldpad_auto ); - y2milestone( "Setting auto start of service 'lldpad' to: %1", (lldpad_auto?"true":"false")); + y2milestone( "Setting auto start of service 'lldpad' to: %1", lldpad_auto ); } void StoreInterfacesDialog (string id, map event) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Thu Jul 21 13:58:46 2011 @@ -126,8 +126,9 @@ _("FCoE Enable"), _("DCB Required"), _("DCB capable") ), [] ), - `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), - `PushButton(`id(`create), _("Create FCoE &VLAN Interface")) ) + `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings")), + `PushButton(`id(`create), _("Create FCoE &VLAN Interface")), + `PushButton(`id(`remove), _("&Remove Interface")) ) ) ) ); -- 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] r64924 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: gs Date: Thu Jul 21 13:58:05 2011 New Revision: 64924 URL: http://svn.opensuse.org/viewcvs/yast?rev=64924&view=rev Log: logging improved Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Thu Jul 21 13:58:05 2011 @@ -635,7 +635,7 @@ global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); - y2milestone( "List of options: %1", options ); + y2milestone( "List of options in /etc/fcoe/config: %1", options ); if ( options == [] || options == nil ) return false; -- 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] r64923 - in /trunk/network: VERSION package/yast2-network.changes src/clients/firewall_stage1_finish.ycp src/clients/firewall_stage1_proposal.ycp
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 13:48:48 2011 New Revision: 64923 URL: http://svn.opensuse.org/viewcvs/yast?rev=64923&view=rev Log: - Fixed Firewall and SSH proposal to be still able to adjust SSH independently on the firewall status (bnc#537980). - 2.20.13 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/firewall_stage1_finish.ycp trunk/network/src/clients/firewall_stage1_proposal.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=64923&r1=649… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jul 21 13:48:48 2011 @@ -1 +1 @@ -2.20.12 +2.20.13 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 Thu Jul 21 13:48:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 21 13:44:24 CEST 2011 - locilka(a)suse.cz + +- Fixed Firewall and SSH proposal to be still able to adjust SSH + independently on the firewall status (bnc#537980). +- 2.20.13 + +------------------------------------------------------------------- Fri Jul 1 13:42:16 CEST 2011 - mvidner(a)suse.cz - Proofread texts for translation (by A.Turrini, bnc#703190). Modified: trunk/network/src/clients/firewall_stage1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Thu Jul 21 13:48:48 2011 @@ -28,20 +28,21 @@ y2debug("func=%1", func); y2debug("param=%1", param); +//we have those from the proposal +boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); +boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); + if (func == "Info") { return (any)$[ "steps" : 1, // progress step title "title" : _("Writing Firewall Configuration..."), - "when" : SuSEFirewallProposal::GetChangedByUser() ? [ `installation, `autoinst ] : [], + "when" : (SuSEFirewallProposal::GetChangedByUser() || ssh_enabled) ? [ `installation, `autoinst ] : [], ]; } else if (func == "Write") { - //we have those from the proposal - boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); - boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1", fw_enabled ? sformat("enabled, ssh port will be %1", ssh_enabled ? "open" : "closed") : "disabled"); Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Thu Jul 21 13:48:48 2011 @@ -127,8 +127,6 @@ SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); } - SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); - SuSEFirewallProposal::SetProposalInitialized(true); } @@ -147,27 +145,23 @@ _("Firewall will be disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)") ) + "</li>\n"; - if (SuSEFirewall4Network::Enabled1stStage()) - { - output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") - : - _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") - ) + "</li>\n"; + output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? + _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") + : + _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") + ) + "</li>\n"; - } output = output + "</ul>\n"; ret = $[ - "preformatted_proposal" : output, - "warning_level" : `warning, - //"warning" : proposal["warning"]:nil, - "links" : [ - "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", - "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", - ] - ]; - + "preformatted_proposal" : output, + "warning_level" : `warning, + //"warning" : proposal["warning"]:nil, + "links" : [ + "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", + "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", + ] + ]; } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]:nil; -- 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] r64922 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:52:31 2011 New Revision: 64922 URL: http://svn.opensuse.org/viewcvs/yast?rev=64922&view=rev Log: correct upper case Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 14:52:31 2011 @@ -123,8 +123,8 @@ should be created and if DCB is required." ) + /* Edit dialog help 3/3 */ _( "The values are: - FCoE enable: yes or no Enable or disable creation of FCoE. - DCB required: yes or no The default is yes, DCB is usually + FCoE Enable: yes or no Enable or disable creation of FCoE. + DCB Required: yes or no The default is yes, DCB is usually required." ), ]; -- 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] r64921 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:47:30 2011 New Revision: 64921 URL: http://svn.opensuse.org/viewcvs/yast?rev=64921&view=rev Log: improve layout of edit dialog Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Jul 20 14:47:30 2011 @@ -233,6 +233,7 @@ // set values for 'FCoE Enabled' and 'DCB Required' UI::ChangeWidget( `id(`fcoe), `Value, card["fcoe_enable"]:"" ); UI::ChangeWidget( `id(`dcb), `Value, card["dcb_required"]:"" ); + // headline of the edit dialog - configuration of values for a certain network interface UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card["fcoe_vlan"]:"" ) ); } Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Wed Jul 20 14:47:30 2011 @@ -64,23 +64,26 @@ return `VBox( `VStretch(), // heading is replaced later (InitEditDialog) - `Label( `id(`heading), ("Configuration of Interface ................................") ), + `Label( `id(`heading), ("Configuration of Interface .......................") ), + `VSpacing(2), `HBox ( `HStretch(), `Frame( (""), - `VBox( - `VSpacing(2), - `ComboBox( `id(`fcoe), _("FCoE Enable"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2), - `ComboBox( `id(`dcb), _("DCB Required"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2) - ) + `MarginBox( 10, 2, + `VBox( + `VSpacing(2), + `ComboBox( `id(`fcoe), _("FCoE Enable"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2), + `ComboBox( `id(`dcb), _("DCB Required"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2) + ) + ) ), `HStretch() ), -- 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] r64920 - /branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:13:56 2011 New Revision: 64920 URL: http://svn.opensuse.org/viewcvs/yast?rev=64920&view=rev Log: removed duplicated *.changes entry Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Jul 20 14:13:56 2011 @@ -8,7 +8,6 @@ - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) -- do not allow to continue without package lock (BNC #616982) - 2.17.17.1 ------------------------------------------------------------------- -- 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] r64919 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/ testsuite/tests/
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:05:51 2011 New Revision: 64919 URL: http://svn.opensuse.org/viewcvs/yast?rev=64919&view=rev Log: backport from SP2 branch: - added new core/full migration selection dialog (fate#311994) - if the system is managed by SUSE Manager display a message and exit (fate#311994) - added a new client for selecting DUP repositories (fate#311994) - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) - 2.17.17.1 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_dup_repositories.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_check.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/include/wagon_helpers.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/include/wagon_helpers.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/RegistrationStatus.pm - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/RegistrationStatus.pm branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.err - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.err branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.out - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.out branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Jul 20 14:05:51 2011 @@ -1 +1 @@ -2.17.18 +2.17.17.1 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Jul 20 14:05:51 2011 @@ -1,8 +1,20 @@ ------------------------------------------------------------------- +Wed Jul 20 11:45:47 UTC 2011 - lslezak(a)suse.cz + +- added new core/full migration selection dialog (fate#311994) +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) +- added a new client for selecting DUP repositories (fate#311994) +- added a new client for checking registration status before + starting migration (fate#309594) +- implemented download in advance mode support (fate#308951) +- do not allow to continue without package lock (BNC #616982) +- 2.17.17.1 + +------------------------------------------------------------------- Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz - Do not allow to continue without package lock (BNC #616982) -- 2.17.18 ------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Wed Jul 20 14:05:51 2011 @@ -57,6 +57,16 @@ return sort (ret); } + list<string> AddedRepos(list<string> prev, list<string> curr) + { + list<string> ret = []; + + // added repos = all current which were not in the previous state + ret = filter(string curr_repo, curr, {return !contains(prev, curr_repo);}); + + return ret; + } + // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); y2milestone ("Currently registered repositories: %1", all_repos); @@ -91,7 +101,13 @@ list <string> current_repos = GetCurrentlyEnabledReposByAlias(); if (all_repos != current_repos) { Wagon::repos_already_registered = true; + + // remember the added repositories + list<string> added = AddedRepos(all_repos, current_repos); + Wagon::SetRegistrationRepos(added); + y2milestone ("List of repositories has changed: %1", current_repos); + y2milestone("Added repositories: %1", added); break; } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp Wed Jul 20 14:05:51 2011 @@ -41,7 +41,7 @@ // Mode::SetMode ("normal"); y2milestone ("Running repositories..."); ret = (symbol) WFM::call ("repositories"); - y2milestone ("Script inst_suse_register returned: %1", ret); + y2milestone ("Script repositories returned: %1", ret); // Mode::SetMode ("update"); if (ret == `cancel || ret == `abort) { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp Wed Jul 20 14:05:51 2011 @@ -20,6 +20,7 @@ import "Wagon"; import "Report"; + import "PackageInstallation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -40,11 +41,23 @@ } Wagon::ProposeDUP(); + Wagon::ProposeDownloadMode(); ret = Wagon::ProposalSummary(); } else if (func == "AskUser") { - Report::Message (_("There is nothing to set.")); + string chosen_id = param["chosen_id"]:""; + + // toggle the download mode status + if (chosen_id == Wagon::GetDownloadModeLink()) + { + PackageInstallation::SetDownloadInAdvance(!PackageInstallation::DownloadInAdvance()); + } + else + { + Report::Message (_("There is nothing to set.")); + } + ret = $[ "workflow_sequence" : `next ]; } else if (func == "Description") { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp Wed Jul 20 14:05:51 2011 @@ -21,6 +21,7 @@ import "Popup"; import "Wagon"; import "Report"; + import "FileUtils"; textdomain "wagon"; @@ -41,6 +42,18 @@ GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::EnableAbortButton (); + // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE Manager + if (FileUtils::Exists("/etc/sysconfig/rhn/systemid")) + { + y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon"); + + // warning message, system managed by SUSE Manager cannot be migrated by wagon + // display this message and exit + Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit.")); + + return (any)`back; + } + any ret = nil; while (true) { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Wed Jul 20 14:05:51 2011 @@ -28,10 +28,13 @@ <name>running_by_applet</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_dup_repositories</module> <module>wagon_modify_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -55,14 +58,17 @@ <name>manual</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_manual_url_repositories</module> + <module>wagon_dup_repositories</module> <module>wagon_modify_repositories</module> <module>wagon_check_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -84,8 +90,11 @@ <name>PatchCD</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_dup_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -162,6 +171,12 @@ <enable_back>no</enable_back> </module> + <module> + <label>Registration Check</label> + <name>registration_check</name> + <execute>wagon_registration_check</execute> + </module> +  <module> <label>Renew Update Stack</label> @@ -244,6 +259,12 @@ </module> <module> + <label>Migration Configuration</label> + <name>wagon_dup_repositories</name> + <execute>wagon_dup_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am Wed Jul 20 14:05:51 2011 @@ -2,8 +2,16 @@ # Makefile.am for wagon/src/modules # -module_DATA = $(wildcard *.ycp) +module_DATA = Wagon.ycp RegistrationStatus.pm EXTRA_DIST = $(module_DATA) +YCPCFLAGS = -I . + +ycpchook = wagon + +wagon: + ln -s ../include wagon + + include $(top_srcdir)/Makefile.am.common Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Jul 20 14:05:51 2011 @@ -31,6 +31,11 @@ import "Update"; import "FileUtils"; import "String"; + import "Packages"; + import "PackageInstallation"; + import "RegistrationStatus"; + + include "wagon/wagon_helpers.ycp"; boolean running_by_applet = false; @@ -75,6 +80,13 @@ return update_workflow_type; } + const string download_mode_link = "wagon-download_in_advance"; + + global define string GetDownloadModeLink() + { + return download_mode_link; + } + string migration_method = nil; global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir); @@ -98,6 +110,35 @@ return migration_method; } + // do the distribution upgrade from selected repositories + list<integer> dup_repos = []; + + global list<integer> DupRepos() + { + return dup_repos; + } + + global void SetDupRepos(list<integer> repos) + { + dup_repos = repos; + } + + // list of repositories (aliases) added by suse_register + list<string> new_registration_repos = []; + + // returns list of repositories (aliases) added by suse_register + global list<string> RegistrationRepos() + { + return new_registration_repos; + } + + // set list of repositories (aliases) added by suse_register + global void SetRegistrationRepos(list<string> repos) + { + y2milestone("Repositories added by registration: %1", new_registration_repos); + new_registration_repos = repos; + } + void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } @@ -369,16 +410,100 @@ return true; } - map <string, any> update_conf = GetUpdateConf(); + // reset upgrade repo config + y2milestone("Resetting upgrade repos config"); + list<integer> repos = Pkg::GetUpgradeRepos(); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + + // all repositories selected for upgrade? + if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos)) + { + // reset solver flags (needed when switching from full DUP to partial DUP + Pkg::SetSolverFlags($["reset" : true]); + + // do full distribution upgrade + map <string, any> update_conf = GetUpdateConf(); + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + } + else + { + // do partial DUP + // add upgrade repositories + y2milestone("Adding upgrade repos: %1", dup_repos); + foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); + + // be compatible with "zypper dup --from" + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); - y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + Pkg::PkgSolve(true); already_proposed = true; return true; } + map<string, any> CheckDownloadSpace() + { + // display a warning if estimated free size after migration is below 100MB + integer min_free_space = 100 << 20; + + map<string, list> du = Pkg::TargetGetDU(); + list<string> mounts = maplist(string dir, list info, du, {return dir;}); + + map<string,any> zconfig = Pkg::ZConfig(); + string pkg_path = zconfig["repo_packages_path"]:""; + + string packages_mount = FindMountPoint(pkg_path, mounts); + y2milestone("Packages will we downloaded to %1 (mountpoint %2)", pkg_path, packages_mount); + + // download size in bytes + integer download_size = Packages::CountSizeToBeDownloaded(); + y2milestone("Size of packages to download: %1MB", download_size >> 20); + + // du contains maps: $[ "dir" : [ total, used, pkgusage, readonly ], .... ] + integer after_install = du[packages_mount, 2]:0; + integer total = du[packages_mount, 0]:0; + y2milestone("Size after installation: %1MB (of %2MB)", after_install >> 20, total >> 20); + + symbol result = `ok; + string message = ""; + + if (after_install + download_size < total) + { + result = `error; + message = sformat(_("There is not enough free space to migrate the system using download in advance mode. Partition %1 needs at least %2MB more free disk space. (The needed size is estimated, it is recommended to add slightly more free space.) Add more disk space or disable download in advance mode."), + packages_mount, (after_install + download_size - total) >> 20); + y2error("Not enough free space for download in advance upgrade: " + + "estimated size after installation: %1MB, download size: %2MB, " + + "total size: %3MB, estimated free space: %4MB", after_install >> 20, + download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + else if (after_install + download_size + min_free_space < total) + { + result = `warning; + message = sformat(_("There might not be enough free space for download in advance mode migration. The estimated free space after migration is %2MB, it is recommended to increase the free space in case the estimation is inaccurate to avoid installation errors."), + (total - after_install - download_size) >> 20); + y2warning("Low free space: estimated size after installation: %1MB, " + + "download size: %2MB, total size: %3MB, estimated free space: %4MB", + after_install >> 20, download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + + return $[ "result" : result, "message" : message ]; + } + + global void ProposeDownloadMode() + { + if (PackageInstallation::DownloadInAdvance() == nil) + { + map<string, any> dwspace = CheckDownloadSpace(); + + PackageInstallation::SetDownloadInAdvance(dwspace["result"]:nil == `ok); + y2milestone("Proposed download in advance mode: %1", PackageInstallation::DownloadInAdvance()); + } + } + global map <string,any> MinimizeProductMap (map <string,any> product) { if (haskey (product, "license")) product["license"] = "..."; if (haskey (product, "description")) product["description"] = "..."; @@ -510,9 +635,14 @@ ret = "<ul>\n" + ret + "</ul>\n"; + ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") + + sformat("<a href=\"%1\">%2</a>", download_mode_link, (PackageInstallation::DownloadInAdvance() ? _("Enabled") : _("Disabled"))) + + "</li></ul>\n"; + map <string, any> summary = $[ "preformatted_proposal" : ret, - // help text + "links" : [ download_mode_link ], + // help text, TODO FIXME: replace the inner by "help" : _("To change the update settings, go to Packages Proposal section."), ]; @@ -630,5 +760,131 @@ return true; } + + /* + * Read registration status and sort products according their status + * @param file Read this registration status file + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatusFromFile(string file) + { + boolean registered_system = true; + integer timestamp = -1; + + list<string> failed = []; + list<string> no_subscription = []; + list<string> expired = []; + list<string> rma = []; + list<string> provisional = []; + list<string> registered = []; + + // 0 = empty file, -1 = missing + if (FileUtils::GetSize(file) <= 0) + { + y2milestone("File %1 does not exist", file); + registered_system = false; + } + else + { + // read the registration status + // see https://wiki.innerweb.novell.com/index.php/Registration#Add_Registration_St… + // for more datils about the file format + map status = RegistrationStatus::ReadFile(file); + + timestamp = tointeger(status["generated"]:"-1"); + list<map> products = status["productstatus"]:[]; + + // check each product + foreach(map product, products, + { + string product_name = product["product"]:""; + + // not registered (error present, but not "expired") + if (product["result"]:"" == "error" && product["errorcode"]:"" != "ERR_SUB_EXP") + { + failed = add(failed, product_name); + } + else + { + // registered, but subscription is not needed (e.g. SLES-SDK) + if (product["subscription"]:$[] == $[]) + { + no_subscription = add(no_subscription, product_name); + } + else + { + string status = product["subscription", "status"]:""; + string expiration = product["subscription", "expiration"]:""; + + // expired subscription (status == EXPIRED or the timestamp is in the past) + if (status == "EXPIRED" || (expiration != "" && tointeger(expiration) < time())) + { + expired = add(expired, product_name); + } + else if (status == "RMA") + { + rma = add(rma, product_name); + } + else + { + string type = product["subscription", "type"]:""; + + // provisional subscription + if (type == "PROVISIONAL") + { + provisional = add(provisional, product_name); + } + else + { + registered = add(registered, product_name); + } + } + } + } + } + ); + } + + return $[ + "registered_system" : registered_system, + "timestamp" : timestamp, + "registered" : registered, + "provisional" : provisional, + "rma" : rma, + "expired" : expired, + "no_subscription" : no_subscription, + "failed" : failed + ]; + + } + + /* + * Read registration status from /var/lib/suseRegister/registration-status.xml and sort products according their status + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatus() + { + return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + } /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Wed Jul 20 14:05:51 2011 @@ -4,11 +4,17 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 -# <upgrades> section from product file -Requires: yast2-pkg-bindings >= 2.17.44 +# Pkg::AddUpgradeRepo() +Requires: yast2-pkg-bindings >= 2.17.45.1 +# Pkg::AddUpgradeRepo() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 + +BuildRequires: perl-XML-Simple +Requires: perl-XML-Simple # Called in proposal and in code -Requires: yast2-packager yast2-add-on +Requires: yast2-packager >= 2.17.78.1 +Requires: yast2-add-on # Counting packages directly in packages proposal (BNC #573482) Requires: yast2-update >= 2.17.19 @@ -47,6 +53,7 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +@moduledir@/*.pm %dir @yncludedir@/wagon @yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control -- 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] r64918 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:01:33 2011 New Revision: 64918 URL: http://svn.opensuse.org/viewcvs/yast?rev=64918&view=rev Log: only start with tab interfaces if both services are enabled Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Wed Jul 20 14:01:33 2011 @@ -121,7 +121,7 @@ ]; map <string, boolean> status_map = FcoeClient::GetStartStatus(); - if ( status_map["fcoe"]:false == true || status_map["lldpad"]:false == true ) + if ( status_map["fcoe"]:false == true && status_map["lldpad"]:false == true ) ini_tab = "interfaces"; else ini_tab = "services"; -- 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] r64917 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:46:50 2011 New Revision: 64917 URL: http://svn.opensuse.org/viewcvs/yast?rev=64917&view=rev Log: more initial space for head line Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Wed Jul 20 13:46:50 2011 @@ -64,7 +64,7 @@ return `VBox( `VStretch(), // heading is replaced later (InitEditDialog) - `Label( `id(`heading), ("Configuration of Interface ...................") ), + `Label( `id(`heading), ("Configuration of Interface ................................") ), `HBox ( `HStretch(), `Frame( (""), -- 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] r64916 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:46:29 2011 New Revision: 64916 URL: http://svn.opensuse.org/viewcvs/yast?rev=64916&view=rev Log: more improvements of help text Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 13:46:29 2011 @@ -78,26 +78,26 @@ /* Services dialog help 1/3 */ "services" : _("<big>Starting of services</big> There is the possibility to enable or disable the start of the services -fcoe and lldpad at boot time. +fcoe and lldpad at boot time. ") + /* Services dialog help 2/3 */ - _("Starting the service fcoe means starting the Fibre Channel over -Ethernet service daemon 'fcoemon' which controls the FCoE interfaces and -establishes a connection with the daemon 'lldpad'." ) + + _("Starting the service fcoe means starting the Fibre Channel over +Ethernet service daemon fcoemon which controls the FCoE interfaces and +establishes a connection with the daemon lldpad." ) + /* Services dialog help 3/3 */ - _("The lldpad service provides the Link Layer Discovery Protocol agent daemon 'lldpad' which informs 'fcoemon' about DCB (Data Center Bridging) features and configuration of the interfaces."), + _("The lldpad service provides the Link Layer Discovery Protocol agent daemon lldpad which informs fcoemon about DCB (Data Center Bridging) features and configuration of the interfaces."), /* Interfaces dialog help 1/4 */ "interfaces" : _("<big>Network interface overview</big> ") + /* Interfaces dialog help 2/4 */ -_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column 'FCoE VLAN interface'.") + +_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column FCoE VLAN interface.") + /* Interfaces dialog help 3/4 */ _("The values for FCoE VLAN Interface in detail: -not available means, FCoE isn't possible (must be enabled on the switch first) -not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. +not available: Fibre Channel over Ethernet isn't possible (must be enabled on the switch first) +not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. If the FCoE VLAN interface is already created the name is shown in the column, e.g. eth3.200.") + /* Interfaces dialog help 3/4 */ @@ -111,20 +111,20 @@ /* Configuration dialog help 3/3 */ _("The values are: -Debug: yes or no is used to enable debugging messages from the fcoe service script and 'fcoemon' -Use syslog: yes or no sends messages to the system log if set to yes (see /var/log/messages)."), +Debug: yes or no is used to enable debugging messages from the fcoe service script and fcoemon +Use syslog: yes or no sends messages to the system log if set to yes (data are logged to /var/log/messages)."), /* edit dialog help 1/3 */ "change" : _("Edit settings in /etc/fcoe/ethx" ) + /* Edit dialog help 2/3 */ - _( "The daemon 'fcoemon' reads these configuration files on initialization. + _( "The daemon fcoemon reads these configuration files on initialization. There is a file for every interface and the values indicate whether FCoE instances should be created and if DCB is required." ) + /* Edit dialog help 3/3 */ _( "The values are: - FCoE enable: yes or no Enable or disable creation of FCoE. - DCB required: yes or no The default is yes, DCB is usually + FCoE enable: yes or no Enable or disable creation of FCoE. + DCB required: yes or no The default is yes, DCB is usually required." ), ]; -- 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] r64915 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:15:55 2011 New Revision: 64915 URL: http://svn.opensuse.org/viewcvs/yast?rev=64915&view=rev Log: improve help text about service start Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 13:15:55 2011 @@ -75,16 +75,19 @@ the configuration opens. "), - /* Services dialog help 1/2 */ + /* Services dialog help 1/3 */ "services" : _("<big>Starting of services</big> -There is the possibility to enable/disable the start of the services +There is the possibility to enable or disable the start of the services fcoe and lldpad at boot time. ") + + /* Services dialog help 2/3 */ + _("Starting the service fcoe means starting the Fibre Channel over +Ethernet service daemon 'fcoemon' which controls the FCoE interfaces and +establishes a connection with the daemon 'lldpad'." ) + - /* Services dialog help 2/2 */ -_("Check the appropriate button, e.g. if you want to start FCoE automatically at -boot time click on 'When booting' in 'FcoE' frame."), - + /* Services dialog help 3/3 */ + _("The lldpad service provides the Link Layer Discovery Protocol agent daemon 'lldpad' which informs 'fcoemon' about DCB (Data Center Bridging) features and configuration of the interfaces."), + /* Interfaces dialog help 1/4 */ "interfaces" : _("<big>Network interface overview</big> ") + -- 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] r64914 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 12:59:59 2011 New Revision: 64914 URL: http://svn.opensuse.org/viewcvs/yast?rev=64914&view=rev Log: reverted commit r62689 ("backported layout change for repository (bnc#510794)"), it should not go out as a maintenance update, it's for SP2 only adjusted version to 2.17.79.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 12:59:59 2011 @@ -1 +1 @@ -2.17.79.1 +2.17.78.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 12:59:59 2011 @@ -5,13 +5,7 @@ libzypp mode (bnc#616708) (backported commits 62714, partly 54940) - support for download in advance mode in yast2-wagon (fate#308951) -- 2.17.79.1 - -------------------------------------------------------------------- -Wed Oct 27 10:14:52 CEST 2010 - mzugec(a)suse.cz - -- backported layout change for repository (bnc#510794) -- 2.17.79 +- 2.17.78.1 ------------------------------------------------------------------- Thu May 6 13:28:47 CEST 2010 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp Wed Jul 20 12:59:59 2011 @@ -69,8 +69,6 @@ const string priority_label = _("&Priority"); - const string keeppackages_label = _("Keep Downloaded Packages"); - // current view: // selected service (or empty) if all services are selected string displayed_service = ""; @@ -209,7 +207,6 @@ "type" : generalData["type"]:"", "priority" : source["priority"]:default_priority, "service" : source["service"]:"", - "keeppackages" : source["keeppackages"]:false, ]; return out; @@ -265,14 +262,7 @@ string url = sformat (_("URL: %1"), raw_url); - string ret = sformat("%1<BIG>%2</BIG>%3%4", icon_tag, name, url, category); - - if (service != "") - { - ret = ret + sformat("%1", service); - } - - return ret; + return sformat("%1<BIG>%2</BIG>%3%4%5", icon_tag, name, url, category, service); } term repoInfoTerm(string name, string url, string category, string service) @@ -285,7 +275,7 @@ `Left(`Label(`id(`service), `opt(`hstretch), service)) ) : - `VSquash(`MinHeight(6, `RichText(`id(`repo_info), ""))); + `VSquash(`MinHeight(7, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -337,9 +327,8 @@ if (repo_mode) { - // priority and keeppackages are displayed only for repositories + // priority is displayed only for repositories UI::ChangeWidget (`id (`priority), `Value, info["priority"]:default_priority); - UI::ChangeWidget (`id (`keeppackages), `Value, info["keeppackages"]:false); } } @@ -508,7 +497,7 @@ // otherwise we will not get their details list<integer> added = newSources (sourceStatesIn, sourceStatesOut); list<integer> deleted = newSources (sourceStatesOut, sourceStatesIn); - boolean have_rug = !norug && (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0; + boolean have_rug = false; boolean any_changed = added != [] || deleted != []; // #217697 if (success && have_rug && any_changed) { UI::OpenDialog ( @@ -562,32 +551,28 @@ return success; } -list<term> buildList() +list<term> buildTree() { - list<term> ret = [ - `item(`id(`all_repositories), _("All repositories")), - `item(`id(`all_services), _("All services")) - ]; + list<term> ret = []; + + list<term> services_t = []; foreach(map<string,any> srv_state, serviceStatesOut, { - term t = `item(`id(srv_state["alias"]:""), sformat(_("Service '%1'"), srv_state["name"]:"")); - ret = add(ret, t); + term t = `item(`id(srv_state["alias"]:""), srv_state["name"]:""); + services_t = add(services_t, t); } ); - return ret; -} - -term RepoFilterWidget() -{ - // combobox label - return `ComboBox(`id(`service_filter), `opt(`notify), _("View"), buildList()); -} - -void UpdateCombobox() -{ - UI::ReplaceWidget(`id(`filter_rp), RepoFilterWidget()); + // alphabetically sort the repositories (by "name" key) + // TODO FIXME: use lsort +// repositories_t = sort(term repo1, term repo2, repositories_t, {y2internal("val: %1", repo1[1]:""); return repo1[1]:"" < repo2[1]:"";}); + + return [ + // true = open the node + `item(`id(`services), _("Services"), true, services_t), + `item(`id(`repositories), _("Repositories"), true, []) + ]; } // return table widget definition @@ -629,7 +614,6 @@ UI::ReplaceWidget(`id(`tabrp), TableWidget(repo_mode)); UI::ReplaceWidget(`id(`priorp), repo_mode ? `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority) : `Empty()); - UI::ReplaceWidget(`id(`keeppkg_rp), repo_mode ? `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label) : `Empty()); } void RemoveReposFromService(string service_alias) @@ -710,59 +694,74 @@ } term contents = - `VBox( - `Right(`ReplacePoint(`id(`filter_rp), RepoFilterWidget())), - `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), - repoInfoTerm("", "", "", ""), - - // label - `Left (`Label (_("Properties"))), - - `HBox( - `HSquash( - `VBox( - // check box - `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), - // check box - `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), - // check box - `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) - ) + `HBox( + `Tree(`id(`tree), `opt(`notify), "", buildTree()), + `VBox( + `HBox( + `VSpacing(9), + `ReplacePoint(`id(`tabrp), TableWidget(repository_view)), + `HSpacing() ), - `HSpacing(1), - `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), - `HStretch() - ), - `VSpacing (0.4), - - (have_rug) ? - // Checkbox label - `Left (`CheckBox (`id (`zmdsync), _("Synchronize Changes with &ZENworks"), !norug && sync_zmd)) - : `Empty(), - - `HBox( - `PushButton (`id (`add), `opt(`key_F3), - Label::AddButton ()), - `PushButton(`id(`replace), `opt(`key_F4), - Label::EditButton ()), - `PushButton (`id(`delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch (), - // push button label - `PushButton (`id (`key_mgr), _("&GPG Keys...")), - // menu button label - `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ - `item(`id(`refresh), refreshButtonLabel ), + `HBox ( + `HSpacing(0.35), + `HWeight (1, `Frame ("", + `HBox ( + `HSpacing (1), + `HWeight( 1, `VBox ( + repoInfoTerm("", "", "", ""), + // label + `Left (`Label (_("Properties"))), + // check box + `HBox( + `HSquash( + `VBox( + `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))) + ) + ), + `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), + `HStretch() + ), + `VSpacing (0.4), + (have_rug) ? + `Left (`CheckBox (`id (`zmdsync), + // Checkbox label + _("Synchronize Changes with &ZENworks"), + !norug && sync_zmd)) + : `Empty() + )), + `HSpacing (0.4) + ) + )), + `HSpacing (1.35) + ), + `VSpacing(0.3), + `HBox( + `PushButton (`id (`add), `opt(`key_F3), + Label::AddButton ()), + `PushButton(`id(`replace), `opt(`key_F4), + Label::EditButton ()), + `PushButton (`id(`delete), `opt(`key_F5), + Label::DeleteButton ()), + `HStretch (), + `PushButton (`id (`key_mgr), _("&GPG Keys...")), // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), - // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) - ]) + `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ + `item(`id(`refresh), refreshButtonLabel ), + // menu button label + `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + // menu button label + `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + ]) + ), + `VSpacing( 0.5 ) ) ); // dialog caption string title = _("Configured Software Repositories"); +// string title = _("Media Containing the Software Repository"); // help string help_text = _(" @@ -816,21 +815,20 @@ help_text = help_text + _("Priority of a Repository Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default priority is 99. If a package is available in more repositories the repository with the highest priority is used."); - // help text, continued help_text = help_text + _("Use the tree displayed on the left side for navigation in repositories and services."); - // help text, continued - help_text = help_text + _("Keep Downloaded Packages Check this option to keep downloaded packages in a local cache so they can be reused later when the packages are reinstalled. If unchecked the downloaded packages are deleted after installation.") + _("The default local cache is located in directory /var/cache/zypp/packages, the location can be changed in /etc/zypp/zypp.conf file."); - Wizard::SetNextButton(`next, Label::OKButton() ); Wizard::SetAbortButton(`abort, Label::CancelButton() ); Wizard::SetContents(title, contents, help_text, false, true); - Wizard::HideBackButton(); + Wizard::DisableBackButton(); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); + // set the current view to repositories + UI::ChangeWidget(`id(`tree), `CurrentItem, `repositories); + symbol input = nil; integer current = -1; @@ -925,23 +923,23 @@ // start the GPG key manager //RunGPGKeyMgmt(); } - else if (input == `service_filter) + else if (input == `tree) { - // handle the combobox events here... - any current_item = UI::QueryWidget(`id(`service_filter), `Value); + // handle tree events here... + any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); // rebuild the dialog if needed - y2milestone("Current combobox item: %1", current_item); + y2milestone("Current tree item: %1", current_item); boolean update_table_widget = false; - if (current_item == `all_repositories) + if (current_item == `repositories) { update_table_widget = !repository_view || displayed_service != ""; y2milestone("Switching to repository view"); repository_view = true; displayed_service = ""; } - else if (current_item == `all_services) + else if (current_item == `services) { update_table_widget = repository_view; y2milestone("Switching to service view"); @@ -1108,8 +1106,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } else @@ -1145,8 +1143,8 @@ } ); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } @@ -1295,8 +1293,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } } @@ -1404,25 +1402,6 @@ y2error("Ignoring event `priority: the widget should NOT be displayed in service mode!"); } } - else if (input == `keeppackages) - { - if (repository_view) - { - // refresh the value in the table - boolean new_keep = (boolean)UI::QueryWidget(`id(`keeppackages), `Value); - y2internal("New keep packages option: %1", new_keep); - - sourceState[ "keeppackages" ] = new_keep; - sourceStatesOut[ global_current ] = sourceState; - - // do not refresh the item in the table - current = -1; - } - else - { - y2error("Ignoring event `keeppackages: the widget should NOT be displayed in service mode!"); - } - } else if (input != `table) { y2warning("Unknown user input: %1", input); @@ -1472,7 +1451,7 @@ } else { - selected_url_scheme = URL::Parse(SourceDialogs::GetURL())["scheme"]:""; + selected_url_scheme = URL::Parse(SourceDialogs::GetRawURL())["scheme"]:""; y2milestone("Selected URL scheme: %1", selected_url_scheme); if (selected_url_scheme == nil || selected_url_scheme == "") @@ -1509,7 +1488,7 @@ // main function - start the workflow symbol StartInstSource() { - have_rug = (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0; + have_rug = false; norug = !have_rug || (size(WFM::Args()) > 0 && WFM::Args(0) == "norug"); Wizard::CreateDialog(); -- 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] r64913 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 12:11:54 2011 New Revision: 64913 URL: http://svn.opensuse.org/viewcvs/yast?rev=64913&view=rev Log: set auto start of services correctly Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Jul 20 12:11:54 2011 @@ -274,7 +274,7 @@ boolean create_ifcfg = false; string ifcfg_file = ""; - if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface + if ( Stage::initial() ) // first stage of installation - create and start FCoE VLAN interface { // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), @@ -431,21 +431,16 @@ void StoreServicesDialog (string id, map event) { y2milestone( "Store services dialog" ); - boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); - if ( fcoe_auto ) - { - FcoeClient::SetStartStatus( "fcoe", true ); - y2milestone( "Setting auto start of FCoE to true"); - } + boolean fcoe_auto = (boolean)UI::QueryWidget( `id ("fcoe_startup_auto"), `Value ); + FcoeClient::SetStartStatus( "fcoe", fcoe_auto ); + y2milestone ("Setting auto start of service 'fcoe' to: %1", (fcoe_auto?"true":"false") ); + boolean lldpad_auto = (boolean)UI::QueryWidget( `id ("lldpad_startup_auto"), `Value ); - if ( lldpad_auto ) - { - FcoeClient::SetStartStatus( "lldpad", true ); - y2milestone( "Setting auto start of lldpad to true"); - } + FcoeClient::SetStartStatus( "lldpad", lldpad_auto ); + y2milestone( "Setting auto start of service 'lldpad' to: %1", (lldpad_auto?"true":"false")); } void StoreInterfacesDialog (string id, map event) -- 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] r64912 - /tags/stable-2_21_6/users/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:14:51 2011 New Revision: 64912 URL: http://svn.opensuse.org/viewcvs/yast?rev=64912&view=rev Log: Created tag stable-2_21_6 for users Added: tags/stable-2_21_6/users/ - copied from r64911, 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] r64911 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/helps.ycp src/inst_user_first.ycp src/users_proposal.ycp src/widgets.ycp
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:13:45 2011 New Revision: 64911 URL: http://svn.opensuse.org/viewcvs/yast?rev=64911&view=rev Log: - remove blowfish hash from selections, make sha512 the default (fate#312321) - 2.21.6 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/helps.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_proposal.ycp trunk/users/src/widgets.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=64911&r1=64910… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed Jul 20 11:13:45 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 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 Wed Jul 20 11:13:45 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 20 11:10:22 CEST 2011 - jsuchome(a)suse.cz + +- remove blowfish hash from selections, make sha512 the default + (fate#312321) +- 2.21.6 + +------------------------------------------------------------------- Fri Jul 15 12:45:19 CEST 2011 - jsuchome(a)suse.cz - adapted testsuite to previous change Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=649… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Wed Jul 20 11:13:45 2011 @@ -47,7 +47,7 @@ # password encryption method -my $encryption_method = "blowfish"; +my $encryption_method = "sha512"; # mail alias for root my $root_alias = ""; Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=64911&r1… ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Wed Jul 20 11:13:45 2011 @@ -35,8 +35,6 @@ "crypt" :_("DES"), // encryption type "md5" : _("MD5"), - // encryption type - "blowfish" : _("Blowfish") ]; string method = Users::EncryptionMethod (); if (type == "ldap") Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Wed Jul 20 11:13:45 2011 @@ -99,8 +99,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -161,12 +159,10 @@ `RadioButtonGroup (`id (`encryption_method), `VBox ( `VSpacing (0.5), // Radio button label: password encryption type - `Left (`RadioButton (`id ("des"), _("&DES (Linux default)"))), + `Left (`RadioButton (`id ("des"), _("&DES"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("md5"), _("&MD5"))), // Radio button label: password encryption type - `Left (`RadioButton (`id ("blowfish"), _("&Blowfish"))), - // Radio button label: password encryption type `Left (`RadioButton (`id ("sha256"), _("SHA-&256"))), // Radio button label: password encryption type `Left (`RadioButton (`id ("sha512"), _("SHA-&512"))), @@ -205,11 +201,7 @@ ") + // Help text for password expert dialog - _(" -Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. -"); - + _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); // help text for main add user dialog string main_help () { Modified: trunk/users/src/users_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev… ============================================================================== --- trunk/users/src/users_proposal.ycp (original) +++ trunk/users/src/users_proposal.ycp Wed Jul 20 11:13:45 2011 @@ -33,8 +33,6 @@ // encryption type "md5" : _("MD5"), // encryption type - "blowfish" : _("Blowfish"), - // encryption type "sha256" : _("SHA-256"), // encryption type "sha512" : _("SHA-512"), @@ -95,7 +93,8 @@ ahref, "/a", user["cn"]:"", user["uid"]:""); } string rest = ""; - if (UsersSimple::EncryptionMethod () != "blowfish") + // only show in summary if non-default method is used + if (UsersSimple::EncryptionMethod () != "sha512") { // summary line rest = sformat (_("Password Encryption Method: %1"), Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=64911&… ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Wed Jul 20 11:13:45 2011 @@ -157,14 +157,7 @@ "); // Help text for password expert dialog 4/5 - help_text = help_text + _(" -Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. -"); - // Help text for password expert dialog 5/5 - help_text = help_text + _(" -As a general rule of thumb, use DES if you are unsure. -"); + help_text = help_text + _("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose."); UI::OpenDialog( `VBox( @@ -174,26 +167,22 @@ `HBox( `HSpacing( 2 ), // frame label - `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), - `VBox( + `RadioButtonGroup(`id (`methods), `Frame( _("Encryption Type"), `HBox (`HSpacing (), `VBox( `VSpacing( 0.5 ), // Radio buttons for password encryption: DES-crypt - `Left(`RadioButton(`id("des"), _("&DES (Linux default)"), + `Left(`RadioButton(`id("des"), _("&DES"), method == "des" ) ), // Radio buttons for password encryption: MD5-crypt `Left(`RadioButton(`id("md5"), _("&MD5"), method == "md5" ) ), - // Radio buttons for password encryption: blowfish-crypt - `Left(`RadioButton(`id("blowfish"), _("&Blowfish"), - method == "blowfish" ) ), // Radio buttons for password encryption: sha256 crypt `Left(`RadioButton(`id("sha256"), _("SHA-&256"), method == "sha256" ) ), // Radio buttons for password encryption: sha512 crypt `Left(`RadioButton(`id("sha512"), _("SHA-&512"), - method == "sha512" ) ) - ) - )), + method == "sha512" ) ), + `VSpacing( 0.5 ) + )))), `HSpacing( 2 ) ), `VSpacing( 0.5 ), -- 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] r64910 - /tags/stable-2_21_1/security/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:05:01 2011 New Revision: 64910 URL: http://svn.opensuse.org/viewcvs/yast?rev=64910&view=rev Log: Created tag stable-2_21_1 for security Added: tags/stable-2_21_1/security/ - copied from r64909, trunk/security/ -- 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] r64909 - in /trunk/security: ./ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: jsuchome Date: Wed Jul 20 11:04:52 2011 New Revision: 64909 URL: http://svn.opensuse.org/viewcvs/yast?rev=64909&view=rev Log: - remove blowfish hash from selections (fate#312321) - 2.21.1 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/Security.ycp trunk/security/src/helps.ycp trunk/security/src/levels.ycp trunk/security/src/security.ycp trunk/security/src/widgets.ycp trunk/security/testsuite/tests/Level1.out trunk/security/testsuite/tests/Level2.out trunk/security/testsuite/tests/Level3.out trunk/security/testsuite/tests/Read.out trunk/security/testsuite/tests/Read.ycp trunk/security/testsuite/tests/Write.out Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=64909&r1=64… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Wed Jul 20 11:04:52 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Wed Jul 20 11:04:52 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 20 11:04:03 CEST 2011 - jsuchome(a)suse.cz + +- remove blowfish hash from selections (fate#312321) +- 2.21.1 + +------------------------------------------------------------------- Tue Apr 5 11:03:35 CEST 2011 - jsuchome(a)suse.cz - added support for SHA-2 based crypto methods (fate309705) Modified: trunk/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/Security.ycp?rev=64… ============================================================================== --- trunk/security/src/Security.ycp (original) +++ trunk/security/src/Security.ycp Wed Jul 20 11:04:52 2011 @@ -122,7 +122,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "GROUP_ENCRYPTION" : "md5", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", @@ -241,21 +241,11 @@ global map PasswordMaxLengths = $[ "des" : 8, "md5" : 127, - "blowfish" : 72, "sha256" : 127, "sha512" : 127 ]; /** - * List of supported password encryption ciphers - */ -list<string> Ciphers = [ - // "des", - "md5", - "blowfish", -]; - -/** * Abort function * return boolean return true if abort */ @@ -330,6 +320,7 @@ global define boolean Read() { Settings = $[]; + modified = false; /* Read security settings */ @@ -381,12 +372,19 @@ // read the password hash settings string method = PamSettings::GetDefaultValue ("CRYPT_FILES"); + // change old default to new default automatically + if (method == "blowfish") + { + y2milestone ("found 'blowfish', changing to new default 'sha512'"); + method = "sha512"; + modified = true; + } if (method == nil || method == "" || - !contains (["des","md5","blowfish","sha256","sha512"],method)) + !contains (["des","md5","sha256","sha512"],method)) { method = PamSettings::GetHashMethod (); } - if (method == "" || !contains (["des","md5","blowfish","sha256","sha512"],method)) + if (method == "" || !contains (["des","md5","sha256","sha512"],method)) method = "des"; Settings["PASSWD_ENCRYPTION"] = method; Settings["GROUP_ENCRYPTION"] = PamSettings::GetGroupHashMethod (); @@ -429,8 +427,6 @@ Settings["PERMISSION_SECURITY"] = perm; y2debug("Settings=%1", Settings); - modified = false; - // remeber the read values Settings_bak = Settings; return true; @@ -530,7 +526,7 @@ Progress::NextStage(); /* pam stuff */ - string encr = Settings["PASSWD_ENCRYPTION"]:"blowfish"; + string encr = Settings["PASSWD_ENCRYPTION"]:"sha512"; PamSettings::SetDefaultValue ("CRYPT_FILES", encr); // use cracklib? Modified: trunk/security/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/helps.ycp?rev=64909… ============================================================================== --- trunk/security/src/helps.ycp (original) +++ trunk/security/src/helps.ycp Wed Jul 20 11:04:52 2011 @@ -126,7 +126,7 @@ _("Password Encryption Method:") + /* Password dialog help 5b/8 */ -_("des, the Linux default method, works in all network environments, +_("DES, the Linux default method, works in all network environments, but it restricts you to passwords no longer than eight characters. If you need compatibility with other systems, use this method.") + @@ -135,9 +135,8 @@ distributions, but not by other systems or old software.") + /* Password dialog help 5d/8 */ -_("Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. A lot of CPU power is needed to calculate the hash, -which makes it difficult to crack passwords with the help of a dictionary.") +_("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.") + + /* Password dialog help 7/8 */ Modified: trunk/security/src/levels.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/levels.ycp?rev=6490… ============================================================================== --- trunk/security/src/levels.ycp (original) +++ trunk/security/src/levels.ycp Wed Jul 20 11:04:52 2011 @@ -66,7 +66,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "0", @@ -108,7 +108,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", @@ -150,7 +150,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", Modified: trunk/security/src/security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/security.ycp?rev=64… ============================================================================== --- trunk/security/src/security.ycp (original) +++ trunk/security/src/security.ycp Wed Jul 20 11:04:52 2011 @@ -159,7 +159,7 @@ // command line help text for 'set passwd' option "help" : _("Password encryption method"), "type" : "enum", - "typespec" : [ "des", "md5", "blowfish", "sha256", "sha512" ], + "typespec" : [ "des", "md5", "sha256", "sha512" ], ], "crack" : $[ // command line help text for 'set crack' option Modified: trunk/security/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/widgets.ycp?rev=649… ============================================================================== --- trunk/security/src/widgets.ycp (original) +++ trunk/security/src/widgets.ycp Wed Jul 20 11:04:52 2011 @@ -166,7 +166,7 @@ /* ComboBox label */ "Label" : _("P&assword Encryption Method"), /* ComboBox values */ - "Options" : [["des","DES"],["md5","MD5"],["blowfish","Blowfish"], ["sha256", "SHA-256"], ["sha512", "SHA-512"]], + "Options" : [["des","DES"],["md5","MD5"],["sha256", "SHA-256"], ["sha512", "SHA-512"]], "Value" : "des", "Notify" : "yes", ], Modified: trunk/security/testsuite/tests/Level1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level1.… ============================================================================== --- trunk/security/testsuite/tests/Level1.out (original) +++ trunk/security/testsuite/tests/Level1.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Modified: trunk/security/testsuite/tests/Level2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.out (original) +++ trunk/security/testsuite/tests/Level2.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Modified: trunk/security/testsuite/tests/Level3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level3.… ============================================================================== --- trunk/security/testsuite/tests/Level3.out (original) +++ trunk/security/testsuite/tests/Level3.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib-minlen=6" $[] Modified: trunk/security/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Read.ou… ============================================================================== --- trunk/security/testsuite/tests/Read.out (original) +++ trunk/security/testsuite/tests/Read.out Wed Jul 20 11:04:52 2011 @@ -56,3 +56,4 @@ Execute .target.bash_output "/usr/sbin/pam-config -q --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -q --pwhistory" $[] Return true +Dump sha512 Modified: trunk/security/testsuite/tests/Read.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Read.yc… ============================================================================== --- trunk/security/testsuite/tests/Read.ycp (original) +++ trunk/security/testsuite/tests/Read.ycp Wed Jul 20 11:04:52 2011 @@ -14,7 +14,7 @@ { -include "testsuite.ycp"; +import "Testsuite"; import "Security"; map scr_info = $[ @@ -97,6 +97,8 @@ ] ]; -TEST(``(Security::Read()),[scr_info,$[],E],nil); +Testsuite::Test (``(Security::Read()),[scr_info,$[],E],nil); +// read blowfish, changed to sha512 +Testsuite::Dump (Security::Settings["PASSWD_ENCRYPTION"]:nil); } Modified: trunk/security/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Write.o… ============================================================================== --- trunk/security/testsuite/tests/Write.out (original) +++ trunk/security/testsuite/tests/Write.out Wed Jul 20 11:04:52 2011 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] -- 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] r64908 - in /branches/SuSE-Code-11-SP1-Branch/packager: ./ agents/ package/ src/clients/ src/modules/
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 10:59:57 2011 New Revision: 64908 URL: http://svn.opensuse.org/viewcvs/yast?rev=64908&view=rev Log: backport from SP2 branch: - correctly display download progress in DownloadInAdvance libzypp mode (bnc#616708) (backported commits 62714, partly 54940) - support for download in advance mode in yast2-wagon (fate#308951) - 2.17.79.1 Added: branches/SuSE-Code-11-SP1-Branch/packager/agents/etc_zypp_conf.scr - copied unchanged from r64331, branches/SuSE-Code-11-SP2-Branch/packager/agents/etc_zypp_conf.scr Modified: branches/SuSE-Code-11-SP1-Branch/packager/ (props changed) branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 10:59:57 2011 @@ -1 +1 @@ -2.17.79 +2.17.79.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am Wed Jul 20 10:59:57 2011 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 10:59:57 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jul 20 08:58:01 UTC 2011 - lslezak(a)suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) (backported commits 62714, + partly 54940) +- support for download in advance mode in yast2-wagon (fate#308951) +- 2.17.79.1 + +------------------------------------------------------------------- Wed Oct 27 10:14:52 CEST 2010 - mzugec(a)suse.cz - backported layout change for repository (bnc#510794) Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp Wed Jul 20 10:59:57 2011 @@ -202,7 +202,15 @@ } // returns [ int successful, list failed, list remaining ] - list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 ); + map<string,any> config = $[ "medium_nr" : current_cd_no ]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + + y2milestone("Commit config: %1", config); + + list commit_result = PackageInstallation::Commit(config); if (commit_result == nil || size (commit_result) == 0) { @@ -437,8 +445,13 @@ // sync package manager FIXME if (result != `abort && ! Stage::initial ()) { - y2milestone ("Calling PkgCommit (%1)", 9999); - Pkg::PkgCommit (9999); + map<string,any> config = $[]; + if (PackageInstallation::DownloadInAdvance() == true) + { + config["download_mode"] = `download_in_advance; + } + y2milestone ("Calling Pkg::Commit(%1)", config); + Pkg::Commit(config); } // BNC #443755 Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp Wed Jul 20 10:59:57 2011 @@ -21,6 +21,17 @@ import "Label"; + boolean download_in_advance = nil; + + global boolean DownloadInAdvance() + { + return download_in_advance; + } + + global void SetDownloadInAdvance(boolean enable) + { + download_in_advance = enable; + } global define any FakePackager( list<list> packages, string inst_source, boolean deleting ); @@ -81,10 +92,8 @@ * Return: [ int successful, list failed, list remaining, list srcremaining ] * **/ - global define list CommitPackages (integer media_number, - integer packages_installed) + global define list Commit(map<string,any> config) { - y2milestone("CommitPackages called: media nr. %1, packages %2", media_number, packages_installed); if ( Mode::test () ) { @@ -95,8 +104,6 @@ } // install packages from this media - y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", - media_number, packages_installed, Pkg::TargetGetDU()); list <integer> sources = Pkg::SourceGetCurrent (false); integer source_id = sources[0]:0; @@ -111,45 +118,28 @@ y2milestone("ID of the first repository: %1", first_source); - if (media_number == 0) + if (config["medium_nr"]:0 == 0) { PackageSlideShow::SetCurrentCdNo (first_source, 1); } else { - PackageSlideShow::SetCurrentCdNo (first_source, media_number); + PackageSlideShow::SetCurrentCdNo (first_source, config["medium_nr"]:0); } PackageSlideShow::UpdateAllCdProgress (false); SlideShow::StartTimer(); - boolean do_commit = true; - if (media_number != 0) - { - list<map<string,any> > pkgs = Pkg::ResolvableProperties ("", `package, ""); - pkgs = filter (map<string,any> p, pkgs, { - return p["status"]:nil == `selected; - }); - do_commit = size (pkgs) > 0; - } - list commit_result = []; - if (do_commit) - { - // returns [ int successful, list failed, list remaining, list srcremaining ] - y2milestone ("Calling PkgCommit (%1)", media_number); - commit_result = Pkg::PkgCommit (media_number); + // returns [ int successful, list failed, list remaining, list srcremaining ] + y2milestone ("Calling Pkg::Commit (%1)", config); + commit_result = Pkg::Commit(config); - SlideShow::StopTimer(); + SlideShow::StopTimer(); - if (commit_result == nil) - { - y2error ("Bad media number %1", media_number); - return []; - } - } - else + if (commit_result == nil) { - y2milestone ("No package from media %1 left for installation", media_number); + y2error ("Commit failed: %1", Pkg::LastError()); + return []; } // see if installation of some packages failed @@ -173,6 +163,19 @@ return commit_result; }; + /** + * commitPackages marked for deletion or installation + * Return: [ int successful, list failed, list remaining, list srcremaining ] + * + **/ + global define list CommitPackages (integer media_number, + integer packages_installed) + { + // this is a backward compatible wrapper for Commit() + y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3", media_number, packages_installed, Pkg::TargetGetDU()); + return Commit($["medium_nr" : media_number]); + } + // // Fake progress bars for Mode::test () Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp Wed Jul 20 10:59:57 2011 @@ -15,6 +15,7 @@ import "Slides"; import "SlideShow"; import "String"; + import "URL"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -27,6 +28,9 @@ global string media_type = _("Medium"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -46,7 +50,6 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size - /*****************************************************************************/ /*************** Formatting functions and helpers ***************************/ /*****************************************************************************/ @@ -325,8 +328,8 @@ { if ( ! silent ) { - y2error( "SlideShow::SanityCheck(): Slide show not correctly initialized: " + - "SlideShow::InitPkgData() never called!" ); + y2error( "PackageSlideShow::SanityCheck(): Slide show not correctly initialized: " + + "PackageSlideShow::InitPkgData() never called!" ); } return false; } @@ -340,7 +343,7 @@ } else if (!silent) { - y2error(-1, "SlideShow::SanityCheck(): Illegal values for current_src (%1) or current_cd (%2)", + y2error(-1, "PackageSlideShow::SanityCheck(): Illegal values for current_src_no (%1) or current_cd_no (%2)", current_src_no, current_cd_no ); y2milestone( "total sizes: %1", total_sizes_per_cd_per_src ); } @@ -385,6 +388,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(list<list<integer> >src_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(list<list<integer> >src_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -433,10 +480,17 @@ remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); init_pkg_data_complete = true; - - y2milestone( "SlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); - y2milestone( "SlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); + + // reset the history log + SlideShow::inst_log = ""; + + y2milestone( "PackageSlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); + y2milestone( "PackageSlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); // RebuildDialog(true); } @@ -759,6 +813,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -772,7 +847,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -912,6 +988,26 @@ SlideShow::SubProgress( pkg_percent, new_text ); } + global void DoneProvide( integer error, string reason, string name ) + { + if (error == 0) + { + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (Pkg::CommitPolicy()["download_mode"]:`default == `download_in_advance) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } + } + } /** * Update progress widgets for all CDs. @@ -1110,10 +1206,13 @@ */ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { - // message in the installatino log, %1 is package name, - // %2 is package size - SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), - remote); + if (remote) + { + // message in the installatino log, %1 is package name, + // %2 is package size + SlideGenericProvideStart (pkg_name, sz, _("Downloading %1 (download size %2)"), + remote); + } } Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp Wed Jul 20 10:59:57 2011 @@ -80,12 +80,9 @@ global void StartProvide( string name, integer archivesize, boolean remote ) { pkg_inprogress = name; + _remote_provide = remote; - if ( remote ) - { - PackageSlideShow::SlideProvideStart (name , archivesize, remote); - _remote_provide = true; - } + PackageSlideShow::SlideProvideStart (name , archivesize, remote); } @@ -119,6 +116,7 @@ if ( _remote_provide ) { PackageSlideShow::UpdateCurrentPackageProgress( 100 ); + PackageSlideShow::DoneProvide( error, reason, name ); _remote_provide = false; } if (SlideShow::GetUserAbort()) @@ -544,8 +542,7 @@ } /** - * Install callbacks for slideshow. Should be in SlideShowCallbacks but - * that doesn't work at the moment. + * Install callbacks for slideshow. */ global void InstallSlideShowCallbacks() { Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Wed Jul 20 10:59:57 2011 @@ -10,14 +10,14 @@ # URLRecode.pm BuildRequires: yast2 >= 2.17.79 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# Pkg::Commit() +Requires: yast2-pkg-bindings >= 2.17.45.1 # URLRecode.pm Requires: yast2 >= 2.17.79 -- 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] r64907 - /tags/branch-Code-11-SP1-2_17_45_1/pkg-bindings/
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:54:51 2011 New Revision: 64907 URL: http://svn.opensuse.org/viewcvs/yast?rev=64907&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_1 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_45_1/pkg-bindings/ (props changed) - copied from r64906, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- 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] r64906 - /tags/branch-Code-11-SP1-2_17_45_1/
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:54:48 2011 New Revision: 64906 URL: http://svn.opensuse.org/viewcvs/yast?rev=64906&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_1 Added: tags/branch-Code-11-SP1-2_17_45_1/ -- 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] r64905 - /branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 21:44:50 2011 New Revision: 64905 URL: http://svn.opensuse.org/viewcvs/yast?rev=64905&view=rev Log: added missing header in *.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 21:44:50 2011 @@ -1,4 +1,5 @@ ------------------------------------------------------------------- +Tue Jul 19 19:43:23 UTC 2011 - lslezak(a)suse.cz - added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() - added Pkg::CommitPolicy() -- 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] r64904 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:44:42 2011 New Revision: 64904 URL: http://svn.opensuse.org/viewcvs/yast?rev=64904&view=rev Log: - 2.17.45.1 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Tue Jul 19 20:44:42 2011 @@ -1 +1 @@ -2.17.45 +2.17.45.1 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:44:42 2011 @@ -7,6 +7,7 @@ (with download_mode, dry_run... options) (FATE#308951) - added Pkg::ZConfig() function returning current libzypp config (FATE#308951) +- 2.17.45.1 ------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz -- 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] r64903 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:43:00 2011 New Revision: 64903 URL: http://svn.opensuse.org/viewcvs/yast?rev=64903&view=rev Log: backport from SP2 branch: - added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() (fate#311994) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:43:00 2011 @@ -1,5 +1,6 @@ ------------------------------------------------------------------- +- added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() - added Pkg::CommitPolicy() - support for download in advance mode in yast2-wagon (fate#308951) - added Pkg::Commit() function which accepts commit options map Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:43:00 2011 @@ -2346,6 +2346,101 @@ return ret; } +/* + Helper function for adding/removing an upgrade repository +*/ +YCPValue PkgFunctions::AddRemoveUpgradeRepo(const YCPInteger &repo, bool add) +{ + if (repo.isNull()) + { + y2error("Passed nil paramter"); + _last_error.setLastError("Used 'nil' repository ID for upgrade"); + return YCPBoolean(false); + } + + long long repo_id = repo->value(); + YRepo_Ptr r = logFindRepository(repo_id); + if (!r) + { + y2error("Invalid repository ID %lld", repo_id); + _last_error.setLastError("Invalid repository ID " + repo->toString()); + return YCPBoolean(false); + } + + zypp::Repository repository(zypp::ResPool::instance().reposFind(r->repoInfo().alias())); + + if (repository == zypp::Repository::noRepository) + { + y2error("Invalid repository ID %lld", repo_id); + _last_error.setLastError("Invalid repository ID " + repo->toString()); + return YCPBoolean(false); + } + + if (add) + { + y2milestone("Adding upgrade repo %lld", repo_id); + zypp_ptr()->resolver()->addUpgradeRepo(repository); + } + else + { + y2milestone("Removing upgrade repo %lld", repo_id); + zypp_ptr()->resolver()->removeUpgradeRepo(repository); + } + + return YCPBoolean(true); +} + +/** + @builtin AddUpgradeRepo + + @short Add upgrade repository for distribution upgrade + @return boolean true on success +*/ +YCPValue PkgFunctions::AddUpgradeRepo(const YCPInteger &repo) +{ + return AddRemoveUpgradeRepo(repo, true); +} + +/** + @builtin RemoveUpgradeRepo + + @short Remove a repository from upgrade list + @return boolean true on success +*/ +YCPValue PkgFunctions::RemoveUpgradeRepo(const YCPInteger &repo) +{ + return AddRemoveUpgradeRepo(repo, false); +} + +/** + @builtin GetUpgradeRepos + + @short Get list of current upgrade repositories + @return list<integer> all current upgrade repositories +*/ +YCPValue PkgFunctions::GetUpgradeRepos() +{ + YCPList ret; + + unsigned long index = 0; + for_(it, repos.begin(), repos.end()) + { + if (!(*it)->isDeleted()) + { + zypp::Repository repository(zypp::ResPool::instance().reposFind((*it)->repoInfo().alias())); + if (zypp_ptr()->resolver()->upgradingRepo(repository)) + { + ret->add(YCPInteger(index)); + } + } + index++; + } + + std::string result(ret->toString()); + y2milestone("Current upgrade repos: %s", result.c_str()); + return ret; +} + /** @builtin GetBackupPath Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:43:00 2011 @@ -232,6 +232,10 @@ YCPValue SourceProvideFileCommon(const YCPInteger &id, const YCPInteger &mid, const YCPString& f, const bool optional, const bool check_signatures, const bool digested); + + // a helper function to add or remove an upgrade repository + YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + public: // general /* TYPEINFO: void() */ @@ -716,6 +720,12 @@ YCPValue Commit (const YCPMap& config); /* TYPEINFO: map<string,any>()*/ YCPValue CommitPolicy(); + /* TYPEINFO: boolean(integer)*/ + YCPValue AddUpgradeRepo(const YCPInteger &repo); + /* TYPEINFO: list<integer>()*/ + YCPValue GetUpgradeRepos(); + /* TYPEINFO: boolean(integer)*/ + YCPValue RemoveUpgradeRepo(const YCPInteger &repo); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64902 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:41:05 2011 New Revision: 64902 URL: http://svn.opensuse.org/viewcvs/yast?rev=64902&view=rev Log: backport from SP2 branch: - fixed type info Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:41:05 2011 @@ -714,7 +714,7 @@ YCPValue PkgCommit (const YCPInteger& medianr); /* TYPEINFO: list<any>(map<string,any>)*/ YCPValue Commit (const YCPMap& config); - /* TYPEINFO: map<string,any>*/ + /* TYPEINFO: map<string,any>()*/ YCPValue CommitPolicy(); /* TYPEINFO: boolean(map<string,any>)*/ -- 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] r64901 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/Package.cc
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:40:23 2011 New Revision: 64901 URL: http://svn.opensuse.org/viewcvs/yast?rev=64901&view=rev Log: backport from SP2 branch: - fix for SLES11-SP1 libzypp Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:40:23 2011 @@ -2107,9 +2107,6 @@ switch (d_mode) { - case zypp::DownloadDefault: - mode = "default"; - break; case zypp::DownloadOnly: mode = "download_only"; break; -- 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] r64900 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:39:23 2011 New Revision: 64900 URL: http://svn.opensuse.org/viewcvs/yast?rev=64900&view=rev Log: backport from SP2 branch: - implemented download in advance mode support for yast2-wagon (fate#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:39:23 2011 @@ -1,5 +1,7 @@ ------------------------------------------------------------------- +- added Pkg::CommitPolicy() +- support for download in advance mode in yast2-wagon (fate#308951) - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) - added Pkg::ZConfig() function returning current libzypp config Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:39:23 2011 @@ -2015,7 +2015,7 @@ return YCPVoid(); } -YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy &policy) +YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy *policy) { zypp::ZYpp::CommitResult result; @@ -2029,7 +2029,7 @@ last_reported_repo = -1; last_reported_mediumnr = 1; - result = zypp_ptr()->commit(policy); + result = zypp_ptr()->commit(*policy); } catch (const zypp::target::TargetAbortedException & excpt) { @@ -2093,6 +2093,48 @@ return ret; } +YCPValue PkgFunctions::CommitPolicy() +{ + YCPMap ret; + + if (commit_policy == NULL) + { + return ret; + } + + zypp::DownloadMode d_mode = commit_policy->downloadMode(); + std::string mode; + + switch (d_mode) + { + case zypp::DownloadDefault: + mode = "default"; + break; + case zypp::DownloadOnly: + mode = "download_only"; + break; + case zypp::DownloadInAdvance: + mode = "download_in_advance"; + break; + case zypp::DownloadInHeaps: + mode = "download_in_heaps"; + break; + case zypp::DownloadAsNeeded: + mode = "download_as_needed"; + break; + default : + y2error("Unknown download mode"); + } + + if (!mode.empty()) + { + ret->add(YCPString("download_mode"), YCPSymbol(mode)); + } + + + return ret; +} + /** @builtin PkgCommit @@ -2118,10 +2160,15 @@ return YCPError ("Bad args to Pkg::PkgCommit"); } - zypp::ZYppCommitPolicy policy; - policy.restrictToMedia( medianr ); + commit_policy = new zypp::ZYppCommitPolicy; + commit_policy->restrictToMedia(medianr); + + YCPValue ret = CommitHelper(commit_policy); - return CommitHelper(policy); + delete commit_policy; + commit_policy = NULL; + + return ret; } /** @@ -2143,7 +2190,7 @@ /* TYPEINFO: list<any>(integer)*/ YCPValue PkgFunctions::Commit (const YCPMap& config) { - zypp::ZYppCommitPolicy policy; + commit_policy = new zypp::ZYppCommitPolicy; if (!config.isNull()) { @@ -2158,28 +2205,32 @@ if (mode == "default") { - policy.downloadMode(zypp::DownloadDefault); + commit_policy->downloadMode(zypp::DownloadDefault); } else if (mode == "download_only") { - policy.downloadMode(zypp::DownloadOnly); + commit_policy->downloadMode(zypp::DownloadOnly); } else if (mode == "download_in_advance") { - policy.downloadMode(zypp::DownloadInAdvance); + commit_policy->downloadMode(zypp::DownloadInAdvance); } else if (mode == "download_in_heaps") { - policy.downloadMode(zypp::DownloadInHeaps); + commit_policy->downloadMode(zypp::DownloadInHeaps); } else if (mode == "download_as_needed") { - policy.downloadMode(zypp::DownloadAsNeeded); + commit_policy->downloadMode(zypp::DownloadAsNeeded); } else { y2error("Invalid download mode: %s", mode.c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + mode); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } @@ -2189,6 +2240,10 @@ { y2error("Invalid download mode: symbol is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid download mode: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2200,7 +2255,7 @@ if (config->value(key)->isInteger()) { unsigned medium_nr = config->value(key)->asInteger()->value(); - policy.restrictToMedia(medium_nr); + commit_policy->restrictToMedia(medium_nr); y2milestone("Restricting commit only to medium number: %u", medium_nr); } @@ -2208,6 +2263,10 @@ { y2error("Invalid medium number: integer is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid medium number: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2219,7 +2278,7 @@ if (config->value(key)->isBoolean()) { bool dry_run = config->value(key)->asBoolean()->value(); - policy.dryRun(dry_run); + commit_policy->dryRun(dry_run); y2milestone("Dry run commit: %s", config->value(key)->asString()->value().c_str()); } @@ -2227,6 +2286,10 @@ { y2error("Dry run option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid dry run option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2238,7 +2301,7 @@ if (config->value(key)->isBoolean()) { bool exclude_docs = config->value(key)->asBoolean()->value(); - policy.rpmExcludeDocs(exclude_docs); + commit_policy->rpmExcludeDocs(exclude_docs); y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); } @@ -2246,6 +2309,10 @@ { y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } @@ -2257,7 +2324,7 @@ if (config->value(key)->isBoolean()) { bool no_signature = config->value(key)->asBoolean()->value(); - policy.rpmNoSignature(no_signature); + commit_policy->rpmNoSignature(no_signature); y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); } @@ -2265,12 +2332,21 @@ { y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + + delete commit_policy; + commit_policy = NULL; + return YCPVoid(); } } } - return CommitHelper(policy); + YCPValue ret = CommitHelper(commit_policy); + + delete commit_policy; + commit_policy = NULL; + + return ret; } /** Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc Tue Jul 19 20:39:23 2011 @@ -61,6 +61,7 @@ _target_root( "/" ) , _target_loaded(false) , zypp_pointer(NULL) + , commit_policy(NULL) ,_callbackHandler( *new CallbackHandler(*this) ) , base_product(NULL) { Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:39:23 2011 @@ -49,6 +49,7 @@ #include <zypp/RepoManager.h> #include <zypp/ProgressData.h> #include <zypp/TmpPath.h> +#include <zypp/ZYppCommitPolicy.h> #include <YRepo.h> #include <i18n.h> @@ -195,6 +196,9 @@ YCPMap Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies); + // CommitPolicy used for commit + zypp::ZYppCommitPolicy *commit_policy; + private: /** @@ -705,11 +709,13 @@ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); - YCPValue CommitHelper(const zypp::ZYppCommitPolicy &policy); + YCPValue CommitHelper(const zypp::ZYppCommitPolicy *policy); /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); /* TYPEINFO: list<any>(map<string,any>)*/ YCPValue Commit (const YCPMap& config); + /* TYPEINFO: map<string,any>*/ + YCPValue CommitPolicy(); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64899 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ src/PkgFunctions.cc yast2-pkg-bindings.spec.in
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:36:41 2011 New Revision: 64899 URL: http://svn.opensuse.org/viewcvs/yast?rev=64899&view=rev Log: backport from SP2 branch: - Pkg::ZConfig() - removed solver_cleandeps_on_remove value (not present in SP2) - removed duplicate License tag from *.spec (added by devtools) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc Tue Jul 19 20:36:41 2011 @@ -334,7 +334,7 @@ ret->add(YCPString("solver_only_requires"), YCPBoolean(zconfig.solver_onlyRequires())); ret->add(YCPString("solver_allow_vendor_change"), YCPBoolean(zconfig.solver_allowVendorChange())); - ret->add(YCPString("solver_cleandeps_on_remove"), YCPBoolean(zconfig.solver_cleandepsOnRemove())); + //ret->add(YCPString("solver_cleandeps_on_remove"), YCPBoolean(zconfig.solver_cleandepsOnRemove())); ret->add(YCPString("solver_upgrade_testcases_to_keep"), YCPBoolean(zconfig.solver_upgradeTestcasesToKeep())); ret->add(YCPString("solver_upgrade_remove_dropped_packages"), YCPBoolean(zconfig.solverUpgradeRemoveDroppedPackages())); ret->add(YCPString("solver_check_system_file"), YCPString(zconfig.solver_checkSystemFile().asString())); Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/yast2-pkg-bindings.spec.in Tue Jul 19 20:36:41 2011 @@ -2,7 +2,6 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 6.22.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] r64898 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/PkgFunctions.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:28:52 2011 New Revision: 64898 URL: http://svn.opensuse.org/viewcvs/yast?rev=64898&view=rev Log: backport from SP2 branch: - added Pkg::ZConfig() function returning current libzypp config (FATE#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:28:52 2011 @@ -2,6 +2,8 @@ - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) +- added Pkg::ZConfig() function returning current libzypp config + (FATE#308951) ------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.cc Tue Jul 19 20:28:52 2011 @@ -35,6 +35,8 @@ #include <ycp/YCPBoolean.h> #include <ycp/YCPMap.h> #include <ycp/YCPVoid.h> +#include <ycp/YCPSymbol.h> +#include <ycp/YCPList.h> #include <zypp/ZYppFactory.h> @@ -274,3 +276,105 @@ last_reported_repo = repo; last_reported_mediumnr = medium; } + +/** + * @builtin ZConfig + * @short get the current libzypp configuration + * @return map<string,any> libzypp configuration map + */ +YCPValue PkgFunctions::ZConfig() +{ + zypp::ZConfig &zconfig = zypp::ZConfig::instance(); + + YCPMap ret; + + ret->add(YCPString("repo_cache_path"), YCPString(zconfig.repoCachePath().asString())); + ret->add(YCPString("repo_metadata_path"), YCPString(zconfig.repoMetadataPath().asString())); + ret->add(YCPString("repo_solv_files_path"), YCPString(zconfig.repoSolvfilesPath().asString())); + ret->add(YCPString("repo_packages_path"), YCPString(zconfig.repoPackagesPath().asString())); + + ret->add(YCPString("config_path"), YCPString(zconfig.configPath().asString())); + + ret->add(YCPString("known_repos_path"), YCPString(zconfig.knownReposPath().asString())); + ret->add(YCPString("known_services_path"), YCPString(zconfig.knownServicesPath().asString())); + + ret->add(YCPString("repo_add_probe"), YCPBoolean(zconfig.repo_add_probe())); + ret->add(YCPString("repo_refresh_delay"), YCPInteger(zconfig.repo_refresh_delay())); + ret->add(YCPString("repo_label_is_alias"), YCPBoolean(zconfig.repoLabelIsAlias())); + + ret->add(YCPString("download_max_concurrent_connections"), YCPInteger(zconfig.download_max_concurrent_connections())); + ret->add(YCPString("download_min_download_speed"), YCPInteger(zconfig.download_min_download_speed())); + ret->add(YCPString("download_max_download_speed"), YCPInteger(zconfig.download_max_download_speed())); + ret->add(YCPString("download_max_silent_tries"), YCPInteger(zconfig.download_max_silent_tries())); + ret->add(YCPString("download_use_deltarpm"), YCPBoolean(zconfig.download_use_deltarpm())); + ret->add(YCPString("download_use_deltarpm_always"), YCPBoolean(zconfig.download_use_deltarpm_always())); + ret->add(YCPString("download_media_prefer_download"), YCPBoolean(zconfig.download_media_prefer_download())); + ret->add(YCPString("download_media_prefer_volatile"), YCPBoolean(zconfig.download_media_prefer_volatile())); + + const char* dmode; + zypp::DownloadMode dm = zconfig.commit_downloadMode(); + + if (dm == zypp::DownloadDefault) dmode = "default"; + else if (dm == zypp::DownloadInAdvance) dmode = "download_in_advance"; + else if (dm == zypp::DownloadAsNeeded) dmode = "download_as_needed"; + else if (dm == zypp::DownloadInHeaps) dmode = "download_in_heaps"; + else if (dm == zypp::DownloadOnly) dmode = "download_only"; + else dmode = "unknown"; + + ret->add(YCPString("download_mode"), YCPSymbol(dmode)); + + ret->add(YCPString("system_root"), YCPString(zconfig.systemRoot().asString())); + ret->add(YCPString("system_architecture"), YCPString(zconfig.systemArchitecture().asString())); + ret->add(YCPString("system_default_architecture"), YCPString(zconfig.defaultSystemArchitecture().asString())); + + ret->add(YCPString("text_locale_default"), YCPString(zconfig.defaultTextLocale().code())); + ret->add(YCPString("text_locale"), YCPString(zconfig.textLocale().code())); + + ret->add(YCPString("vendor_path"), YCPString(zconfig.vendorPath().asString())); + + ret->add(YCPString("solver_only_requires"), YCPBoolean(zconfig.solver_onlyRequires())); + ret->add(YCPString("solver_allow_vendor_change"), YCPBoolean(zconfig.solver_allowVendorChange())); + ret->add(YCPString("solver_cleandeps_on_remove"), YCPBoolean(zconfig.solver_cleandepsOnRemove())); + ret->add(YCPString("solver_upgrade_testcases_to_keep"), YCPBoolean(zconfig.solver_upgradeTestcasesToKeep())); + ret->add(YCPString("solver_upgrade_remove_dropped_packages"), YCPBoolean(zconfig.solverUpgradeRemoveDroppedPackages())); + ret->add(YCPString("solver_check_system_file"), YCPString(zconfig.solver_checkSystemFile().asString())); + + ret->add(YCPString("locks_file"), YCPString(zconfig.locksFile().asString())); + ret->add(YCPString("locks_file_apply"), YCPBoolean(zconfig.apply_locks_file())); + + ret->add(YCPString("update_data_path"), YCPString(zconfig.update_dataPath().asString())); + ret->add(YCPString("update_messages_path"), YCPString(zconfig.update_messagesPath().asString())); + ret->add(YCPString("update_scripts_path"), YCPString(zconfig.update_scriptsPath().asString())); + ret->add(YCPString("update_messages_notify"), YCPString(zconfig.updateMessagesNotify())); + + YCPList rpm_flags; + zypp::target::rpm::RpmInstFlags flags = zconfig.rpmInstallFlags(); + + if (flags.testFlag(zypp::target::rpm::RPMINST_EXCLUDEDOCS)) rpm_flags->add(YCPString("--excludedocs")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NOSCRIPTS)) rpm_flags->add(YCPString("--noscripts")); + if (flags.testFlag(zypp::target::rpm::RPMINST_FORCE)) rpm_flags->add(YCPString("--force")); + if (flags.testFlag(zypp::target::rpm::RPMINST_IGNORESIZE)) rpm_flags->add(YCPString("--ignoresize")); + if (flags.testFlag(zypp::target::rpm::RPMINST_JUSTDB)) rpm_flags->add(YCPString("--justdb")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NODEPS)) rpm_flags->add(YCPString("--nodeps")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NODIGEST)) rpm_flags->add(YCPString("--nodigest")); + if (flags.testFlag(zypp::target::rpm::RPMINST_NOSIGNATURE)) rpm_flags->add(YCPString("--nosignature")); + if (flags.testFlag(zypp::target::rpm::RPMINST_TEST)) rpm_flags->add(YCPString("--test")); + + if (flags.testFlag(zypp::target::rpm::RPMINST_NOUPGRADE)) + rpm_flags->add(YCPString("-i")); + else + rpm_flags->add(YCPString("-U")); + + ret->add(YCPString("rpm_install_flags"), rpm_flags); + + ret->add(YCPString("history_log_file"), YCPString(zconfig.historyLogFile().asString())); + + ret->add(YCPString("credentials_global_dir"), YCPString(zconfig.credentialsGlobalDir().asString())); + ret->add(YCPString("credentials_global_file"), YCPString(zconfig.credentialsGlobalFile().asString())); + + ret->add(YCPString("plugins_path"), YCPString(zconfig.pluginsPath().asString())); + + ret->add(YCPString("distro_version_pkg"), YCPString(zconfig.distroverpkg())); + + return ret; +} Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:28:52 2011 @@ -826,6 +826,9 @@ /* TYPEINFO: boolean(string)*/ YCPValue ServiceSave(const YCPString &alias); + // configuration related functions + /* TYPEINFO: map<string,any>()*/ + YCPValue ZConfig(); YCPValue ResolvablePropertiesEx(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version, bool dependencies); YCPValue ResolvableSetPatches(const YCPSymbol& kind_r, bool preselect); -- 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] r64897 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: ./ package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.h
by lslezak＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: lslezak Date: Tue Jul 19 20:26:35 2011 New Revision: 64897 URL: http://svn.opensuse.org/viewcvs/yast?rev=64897&view=rev Log: backport from SP2 branch: - added Pkg::Commit() function which accepts commit options map (with download_mode, dry_run... options) (FATE#308951) Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jul 19 20:26:35 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- + +- added Pkg::Commit() function which accepts commit options map + (with download_mode, dry_run... options) (FATE#308951) + +------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz - reload services after refresh to avoid overwriting the updated Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Tue Jul 19 20:26:35 2011 @@ -2015,31 +2015,8 @@ return YCPVoid(); } -/** - @builtin PkgCommit - - @short Commit package changes (actually install/delete packages) - @description - - if medianr == 0, all packages regardless of media are installed - - if medianr > 0, only packages from this media are installed - - @param integer medianr Media Number - @return list [ int successful, list failed, list remaining, list srcremaining ] - The 'successful' value will be negative, if installation was aborted ! - -*/ -YCPValue -PkgFunctions::PkgCommit (const YCPInteger& media) +YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy &policy) { - int medianr = media->value (); - - if (medianr < 0) - { - return YCPError ("Bad args to Pkg::PkgCommit"); - } - zypp::ZYpp::CommitResult result; // clean the last reported source @@ -2052,8 +2029,6 @@ last_reported_repo = -1; last_reported_mediumnr = 1; - zypp::ZYppCommitPolicy policy; - policy.restrictToMedia( medianr ); result = zypp_ptr()->commit(policy); } catch (const zypp::target::TargetAbortedException & excpt) @@ -2119,6 +2094,186 @@ } /** + @builtin PkgCommit + + @short Commit package changes (actually install/delete packages), see also Pkg::Commit() + @description + + if medianr == 0, all packages regardless of media are installed + + if medianr > 0, only packages from this media are installed + + @param integer medianr Media Number + @return list [ int successful, list failed, list remaining, list srcremaining ] + The 'successful' value will be negative, if installation was aborted ! + +*/ +YCPValue +PkgFunctions::PkgCommit (const YCPInteger& media) +{ + int medianr = media->value (); + + if (medianr < 0) + { + return YCPError ("Bad args to Pkg::PkgCommit"); + } + + zypp::ZYppCommitPolicy policy; + policy.restrictToMedia( medianr ); + + return CommitHelper(policy); +} + +/** + * @builtin Commit + * + * @short Commit package changes (actually install/delete packages) + * @description + * + * @param map commit configuration, currently supported values: + * $["download_mode":`default|`download_only|`download_only|`download_in_advance| + * `download_in_heaps|`download_as_needed, "medium_nr":<integer>, + * "dry_run":<boolean>, "exclude_docs":<boolean>, "no_signature":<boolean>], + * the default is $["download_mode":`default, "medium_nr":0 (all media), + * "dry_run":false, "exclude_docs":false, "no_signature":false], + * + * @return list [ int successful, list failed, list remaining, list srcremaining ] + * The 'successful' value will be negative, if installation was aborted ! +*/ +/* TYPEINFO: list<any>(integer)*/ +YCPValue PkgFunctions::Commit (const YCPMap& config) +{ + zypp::ZYppCommitPolicy policy; + + if (!config.isNull()) + { + YCPString key("download_mode"); + + // set the download mode + if(!config->value(key).isNull()) + { + if (config->value(key)->isSymbol()) + { + std::string mode = config->value(key)->asSymbol()->symbol(); + + if (mode == "default") + { + policy.downloadMode(zypp::DownloadDefault); + } + else if (mode == "download_only") + { + policy.downloadMode(zypp::DownloadOnly); + } + else if (mode == "download_in_advance") + { + policy.downloadMode(zypp::DownloadInAdvance); + } + else if (mode == "download_in_heaps") + { + policy.downloadMode(zypp::DownloadInHeaps); + } + else if (mode == "download_as_needed") + { + policy.downloadMode(zypp::DownloadAsNeeded); + } + else + { + y2error("Invalid download mode: %s", mode.c_str()); + _last_error.setLastError(std::string("Invalid download mode: ") + mode); + return YCPVoid(); + } + + y2milestone("Using download mode: %s", mode.c_str()); + } + else + { + y2error("Invalid download mode: symbol is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid download mode: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("medium_nr"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isInteger()) + { + unsigned medium_nr = config->value(key)->asInteger()->value(); + policy.restrictToMedia(medium_nr); + + y2milestone("Restricting commit only to medium number: %u", medium_nr); + } + else + { + y2error("Invalid medium number: integer is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid medium number: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("dry_run"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool dry_run = config->value(key)->asBoolean()->value(); + policy.dryRun(dry_run); + + y2milestone("Dry run commit: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("Dry run option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid dry run option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("exclude_docs"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool exclude_docs = config->value(key)->asBoolean()->value(); + policy.rpmExcludeDocs(exclude_docs); + + y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + + key = YCPString("no_signature"); + // set the medium number + if(!config->value(key).isNull()) + { + if (config->value(key)->isBoolean()) + { + bool no_signature = config->value(key)->asBoolean()->value(); + policy.rpmNoSignature(no_signature); + + y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); + } + else + { + y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); + _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + return YCPVoid(); + } + } + } + + return CommitHelper(policy); +} + +/** @builtin GetBackupPath @short get current path for update backup of rpm config files Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Tue Jul 19 20:26:35 2011 @@ -705,8 +705,11 @@ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); + YCPValue CommitHelper(const zypp::ZYppCommitPolicy &policy); /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); + /* TYPEINFO: list<any>(map<string,any>)*/ + YCPValue Commit (const YCPMap& config); /* TYPEINFO: boolean(map<string,any>)*/ YCPValue AddLock(const YCPMap &lock); -- 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] r64896 - /tags/branch-Code-11-SP2-2_17_39/ldap-server/
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:51:51 2011 New Revision: 64896 URL: http://svn.opensuse.org/viewcvs/yast?rev=64896&view=rev Log: Created tag branch-Code-11-SP2-2_17_39 for ldap-server Added: tags/branch-Code-11-SP2-2_17_39/ldap-server/ (props changed) - copied from r64895, branches/SuSE-Code-11-SP2-Branch/ldap-server/ -- 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] r64895 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:50:04 2011 New Revision: 64895 URL: http://svn.opensuse.org/viewcvs/yast?rev=64895&view=rev Log: Preparing 2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION Tue Jul 19 17:50:04 2011 @@ -1 +1 @@ -2.17.38 +2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Tue Jul 19 17:50:04 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 19 15:43:28 UTC 2011 - rhafer(a)suse.de + +- Version 2.17.39 +- Clarify meaning of mirrormode checkbox (bnc#705474) +- Add DB_CONFIG settings to cn=config for first database (bnc#706447) +- Fixed crash when creating additional database (bnc#706468) + +------------------------------------------------------------------- Mon Jul 18 13:07:51 UTC 2011 - rhafer(a)suse.de - Version 2.17.38 -- 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] r64894 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server/src: dialogs.ycp helps.ycp
by rhafer＠svn2.opensuse.org 19 Jul '11

19 Jul '11

Author: rhafer Date: Tue Jul 19 17:43:02 2011 New Revision: 64894 URL: http://svn.opensuse.org/viewcvs/yast?rev=64894&view=rev Log: Clarify meaning of mirrormode checkbox (bnc#705474) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Tue Jul 19 17:43:02 2011 @@ -1093,7 +1093,9 @@ `VSpacing( 0.5 ), `Password( `id( `te_valid_rootpw ), `opt( `hstretch ), _("&Validate Password") ), `VSpacing( 0.5 ), - `CheckBox( `id( `cb_mirror_mode ), _("MirrorMode") ) + `Left( + `CheckBox( `id( `cb_mirror_mode ), _("Prepare for MirrorMode replication (generates the serverId attribute)") ) + ) ) ) ); Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/helps.ycp Tue Jul 19 17:43:02 2011 @@ -298,12 +298,14 @@ "master_setup_dialog" : _("Enter a password for the configuration database (\"cn=config\") here. This is required to make -the configuration database accessible remotely."), +the configuration database accessible remotely.") + + _("If the server is supposed to participate in a MirrorMode setup, select the \"Prepare for MirrorMode replication\" +checkbox. This will ensure that the serverId Attribute is generated as needed for MirrorMode replication."), "slave_dialog" : _("To setup a slave server some details need to be queried from the master server. Please enter the master server's hostname, adjust the protocol (either \"ldap\" or \"ldaps\") and port number as needed and enter the password -for the master's configuration database (\"cn=config\")."), +for the master's configuration database (\"cn=config\").") ]; /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0