July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65093 - /trunk/gtk/src/ygtkratiobox.c
by rpmcruz＠svn2.opensuse.org 30 Jul '11

30 Jul '11

Author: rpmcruz Date: Sat Jul 30 14:53:18 2011 New Revision: 65093 URL: http://svn.opensuse.org/viewcvs/yast?rev=65093&view=rev Log: Fixed code typo. Modified: trunk/gtk/src/ygtkratiobox.c Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=65093… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Sat Jul 30 14:53:18 2011 @@ -338,7 +338,7 @@ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (adj_size), FALSE); } -static gint ygtk_adj_size_get_preferred_size ( +static void ygtk_adj_size_get_preferred_size ( GtkWidget *widget, GtkRequisition *requisition) { GtkWidget *child = gtk_bin_get_child(GTK_BIN (widget)); -- 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] r65092 - /trunk/gtk/package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 30 Jul '11

30 Jul '11

Author: rpmcruz Date: Sat Jul 30 14:34:42 2011 New Revision: 65092 URL: http://svn.opensuse.org/viewcvs/yast?rev=65092&view=rev Log: Milestone version. Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Jul 30 14:34:42 2011 @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Thu Jul 28 05:57:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt +Sat Jul 30 13:33:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.22.0 - ported to gtk3 - don't show unsupported packages when the list is empty (bnc#704103). - showing mnemonics characters (bnc#704102). +- show "Re-install" menu when selecting various installed packages. ------------------------------------------------------------------- Wed May 25 07:25:22 UTC 2011 - coolo(a)novell.com -- 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] r65091 - /trunk/gtk/src/pkg/ygtkpkglistview.cc
by rpmcruz＠svn2.opensuse.org 30 Jul '11

30 Jul '11

Author: rpmcruz Date: Sat Jul 30 14:33:13 2011 New Revision: 65091 URL: http://svn.opensuse.org/viewcvs/yast?rev=65091&view=rev Log: * show "Re-install" menu when selecting various installed packages. (Atri request) Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Sat Jul 30 14:33:13 2011 @@ -421,7 +421,7 @@ static void install_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->getSelected().install(); } static void reinstall_cb (GtkMenuItem *item, YGtkPkgListView *pThis) - { reinstall (pThis->getSelected().get(0)); } + { reinstall (pThis->getSelected()); } static void remove_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->getSelected().remove(); } static void undo_cb (GtkMenuItem *item, YGtkPkgListView *pThis) @@ -433,27 +433,38 @@ static void select_all_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->selectAll(); } - static bool hasReinstall (Ypp::Selectable sel) + static bool canReinstall (Ypp::List list) { - if (sel.hasInstalledVersion()) { - Ypp::Version installedVersion = sel.installed(); - for (int i = 0; i < sel.totalVersions(); i++) { - Ypp::Version version = sel.version (i); - if (!version.isInstalled() && version == installedVersion) - return true; + for(int i = 0; i < list.size(); i++) { + Ypp::Selectable &sel = list.get(i); + if (sel.hasInstalledVersion()) { + Ypp::Version installedVersion = sel.installed(); + int j; + for (j = 0; j < sel.totalVersions(); j++) { + Ypp::Version version = sel.version (j); + if (!version.isInstalled() && version == installedVersion) + break; + } + if(j == sel.totalVersions()) + return false; } + else + return false; } - return false; + return true; } - static void reinstall (Ypp::Selectable sel) + static void reinstall (Ypp::List list) { - Ypp::Version installedVersion = sel.installed(); - for (int i = 0; i < sel.totalVersions(); i++) { - Ypp::Version version = sel.version (i); - if (!version.isInstalled() && version == installedVersion) { - sel.setCandidate (version); - sel.install(); - break; + for(int i = 0; i < list.size(); i++) { + Ypp::Selectable &sel = list.get(i); + Ypp::Version installedVersion = sel.installed(); + for (int j = 0; j < sel.totalVersions(); j++) { + Ypp::Version version = sel.version (j); + if (!version.isInstalled() && version == installedVersion) { + sel.setCandidate (version); + sel.install(); + break; + } } } } @@ -477,7 +488,7 @@ if (props.hasUpgrade() && !modified) inner::appendItem (menu, _("&Upgrade"), 0, GTK_STOCK_GO_UP, !locked, inner::install_cb, pThis); - if (type == Ypp::Selectable::PACKAGE && list.size() == 1 && inner::hasReinstall (list.get(0)) && !modified) + if (type == Ypp::Selectable::PACKAGE && inner::canReinstall(list) && !modified) inner::appendItem (menu, _("&Re-install"), 0, GTK_STOCK_REFRESH, !locked, inner::reinstall_cb, pThis); if (props.isInstalled() && !modified) -- 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] r65090 - in /trunk/gtk: package/yast2-gtk.changes yast2-gtk.spec.in
by rpmcruz＠svn2.opensuse.org 30 Jul '11

30 Jul '11

Author: rpmcruz Date: Sat Jul 30 14:03:34 2011 New Revision: 65090 URL: http://svn.opensuse.org/viewcvs/yast?rev=65090&view=rev Log: * fixed .changes file * set gtk3 as package requirement Modified: trunk/gtk/package/yast2-gtk.changes trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sat Jul 30 14:03:34 2011 @@ -8,6 +8,11 @@ - showing mnemonics characters (bnc#704102). ------------------------------------------------------------------- +Wed May 25 07:25:22 UTC 2011 - coolo(a)novell.com + +- make it build with gcc 4.6 (temporary aid) + +------------------------------------------------------------------- Sat Apr 16 13:51:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.96 Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=65090&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Sat Jul 30 14:03:34 2011 @@ -8,14 +8,12 @@ License: GPL v2.1 or later BuildRequires: cmake BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel -BuildRequires: gtk2-devel -%if 0%{?suse_version} > 1130 +BuildRequires: gtk3-devel BuildRequires: gdk-pixbuf-devel -%endif BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 -Requires: gtk2 +Requires: gtk3 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Requires: yast2-branding -- 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] r65089 - /trunk/autoinstallation/autoyast2.spec.in
by ug＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: ug Date: Fri Jul 29 16:12:59 2011 New Revision: 65089 URL: http://svn.opensuse.org/viewcvs/yast?rev=65089&view=rev Log: requires yast2-transfer Modified: trunk/autoinstallation/autoyast2.spec.in Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Fri Jul 29 16:12:59 2011 @@ -15,6 +15,7 @@ Requires: autoyast2-installation = %{version} Requires: yast2-schema yast2 yast2-country yast2-storage Requires: yast2-storage >= 2.19.13 +Requires: yast2-transfer >= 2.21.0 Provides: yast2-module-autoinst yast2-config-autoinst Obsoletes: yast2-module-autoinst yast2-config-autoinst @@ -46,6 +47,7 @@ # After API cleanup Requires: yast2-update >= 2.18.3 Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp +Requires: yast2-transfer >= 2.21.0 Provides: yast2-trans-autoinst Obsoletes: yast2-trans-autoinst %description installation -- 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] r65088 - in /trunk/transfer: VERSION package/yast2-transfer.changes
by ug＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: ug Date: Fri Jul 29 16:02:24 2011 New Revision: 65088 URL: http://svn.opensuse.org/viewcvs/yast?rev=65088&view=rev Log: 2.21.0 Modified: trunk/transfer/VERSION trunk/transfer/package/yast2-transfer.changes Modified: trunk/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/VERSION?rev=65088&r1=65… ============================================================================== --- trunk/transfer/VERSION (original) +++ trunk/transfer/VERSION Fri Jul 29 16:02:24 2011 @@ -1 +1 @@ -2.18.1 +2.21.0 Modified: trunk/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/package/yast2-transfer.… ============================================================================== --- trunk/transfer/package/yast2-transfer.changes (original) +++ trunk/transfer/package/yast2-transfer.changes Fri Jul 29 16:02:24 2011 @@ -2,6 +2,7 @@ Fri Jul 29 14:16:32 CEST 2011 - ug(a)suse.de - add support for client certificates for HTTPS +- 2.21.0 ------------------------------------------------------------------- Fri Oct 9 14:13:13 CEST 2009 - ug(a)suse.de -- 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] r65087 - in /trunk/autoinstallation: package/autoyast2.changes src/include/io.ycp
by ug＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: ug Date: Fri Jul 29 15:56:27 2011 New Revision: 65087 URL: http://svn.opensuse.org/viewcvs/yast?rev=65087&view=rev Log: added support for client certificated with HTTPS Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/io.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 29 15:56:27 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 15:56:00 CEST 2011 - ug(a)suse.de + +- added support for client certificated with HTTPS + +------------------------------------------------------------------- Wed Jul 27 14:14:59 CEST 2011 - ug(a)suse.de - added fibre channel autoyast client to 1st stage Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Fri Jul 29 15:56:27 2011 @@ -74,6 +74,12 @@ if ( Scheme == "http" || Scheme == "https" ) { HTTP::easySSL( true ); + if (SCR::Read(.target.size, "/etc/ssl/clientcerts/client-cert.pem" ) > 0 ) { + HTTP::clientCertSSL( "/etc/ssl/clientcerts/client-cert.pem" ); + } + if (SCR::Read(.target.size, "/etc/ssl/clientcerts/client-key.pem" ) > 0 ) { + HTTP::clientKeySSL( "/etc/ssl/clientcerts/client-key.pem" ); + } res = HTTP::Get(full_url, Localfile); if (res["code"]:0 == 200) { -- 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] r65086 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/clients/wagon_migration_products.ycp
by lslezak＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: lslezak Date: Fri Jul 29 15:23:44 2011 New Revision: 65086 URL: http://svn.opensuse.org/viewcvs/yast?rev=65086&view=rev Log: - do not disable current repositories, minimal migration uses "DUP from" feature so they can stay enabled (bnc#708632) - adapted help texts Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Fri Jul 29 15:23:44 2011 @@ -3,6 +3,8 @@ - display solver error in the migration propsal, do not allow starting migration when there is an unsolved problem (bnc#708676) +- do not disable current repositories, minimal migration uses + "DUP from" feature so they can stay enabled (bnc#708632) ------------------------------------------------------------------- Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Fri Jul 29 15:23:44 2011 @@ -166,9 +166,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), !full)), + `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"), full)) + `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full)) ) ) ) @@ -184,7 +184,9 @@ // help text string help_text = "" + _("Select the requested migration type.") // help text - + "" + _("Minimal migration migrates only minimal set of packages (the core packages providing basic system functionality), full migration migrates all installed packages.") + ""; + + "" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest version available in any enabled repository. Full migration might use third party repositories.") + // help text + + "" + _("Press Advanced button to manually select the repositories used for upgrading.") + ""; Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp Fri Jul 29 15:23:44 2011 @@ -290,9 +290,6 @@ ResetPackager(); - // Remembers all repositories that will be disabled later (after registration run) - FindOldRepositoriesToBeDisabled(); - y2milestone ("Returning: %1", ret); return ret; -- 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] r65085 - in /trunk/transfer: agent-curl/src/CurlAgent.cc agent-curl/src/CurlAgent.h module/HTTP.ycp package/yast2-transfer.changes
by ug＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: ug Date: Fri Jul 29 14:17:07 2011 New Revision: 65085 URL: http://svn.opensuse.org/viewcvs/yast?rev=65085&view=rev Log: added support for client certificates for HTTPS Modified: trunk/transfer/agent-curl/src/CurlAgent.cc trunk/transfer/agent-curl/src/CurlAgent.h trunk/transfer/module/HTTP.ycp trunk/transfer/package/yast2-transfer.changes Modified: trunk/transfer/agent-curl/src/CurlAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/agent-curl/src/CurlAgen… ============================================================================== --- trunk/transfer/agent-curl/src/CurlAgent.cc (original) +++ trunk/transfer/agent-curl/src/CurlAgent.cc Fri Jul 29 14:17:07 2011 @@ -22,6 +22,8 @@ CurlAgent::CurlAgent() : SCRAgent() { easySSL_val = false; + clientKeyPath_val = NULL; + clientCertPath_val = NULL; } /** @@ -37,6 +39,30 @@ return; } +void CurlAgent::clientCertSSL( const char *path ) +{ + if( clientCertPath_val != NULL ) + free(clientCertPath_val); + if( path != NULL ) { + clientCertPath_val = new char [strlen (path) + 1]; + if( clientCertPath_val != NULL ) + strcpy( clientCertPath_val, path ); + } + return; +} + +void CurlAgent::clientKeySSL( const char *path ) +{ + if( clientKeyPath_val != NULL ) + free(clientKeyPath_val); + if( path != NULL ) { + clientKeyPath_val = new char [strlen (path) + 1]; + if( clientKeyPath_val != NULL ) + strcpy( clientKeyPath_val, path ); + } + return; +} + YCPValue CurlAgent::Get( const char *url, const char *target) { @@ -64,6 +90,10 @@ curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); if( easySSL_val ) curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); + if( clientCertPath_val != NULL ) + curl_easy_setopt(curl, CURLOPT_SSLCERT, clientCertPath_val); + if( clientKeyPath_val != NULL ) + curl_easy_setopt(curl, CURLOPT_SSLKEY, clientKeyPath_val); res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile); if ( res != 0 ) { fclose( outfile ); @@ -235,6 +265,18 @@ easySSL( (bool)(value->asBoolean()->value()) ); } } + else if (path_name == "clientKeySSL") + { + if ( !value.isNull() ) { + clientKeySSL( (const char *)(value->asString()->value().c_str()) ); + } + } + else if (path_name == "clientCertSSL") + { + if ( !value.isNull() ) { + clientCertSSL( (const char *)(value->asString()->value().c_str()) ); + } + } /* else if (path_name == "post") { Modified: trunk/transfer/agent-curl/src/CurlAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/agent-curl/src/CurlAgen… ============================================================================== --- trunk/transfer/agent-curl/src/CurlAgent.h (original) +++ trunk/transfer/agent-curl/src/CurlAgent.h Fri Jul 29 14:17:07 2011 @@ -27,6 +27,8 @@ * Agent private variables */ bool easySSL_val; + char* clientKeyPath_val; + char* clientCertPath_val; public: /** @@ -76,6 +78,8 @@ // virtual YCPValue Post( const char *url, const char *post, const char *target); virtual string getMapValue ( const YCPMap map, const string key, const string defaultValue); virtual void easySSL( bool easy ); + virtual void clientCertSSL( const char *path ); + virtual void clientKeySSL( const char *path ); private: Modified: trunk/transfer/module/HTTP.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/module/HTTP.ycp?rev=650… ============================================================================== --- trunk/transfer/module/HTTP.ycp (original) +++ trunk/transfer/module/HTTP.ycp Fri Jul 29 14:17:07 2011 @@ -58,5 +58,18 @@ return; } +global define void clientCertSSL( string cert_path ) ``{ + y2debug("setting clientCertSSL to %1",cert_path); + SCR::Execute(.curl.clientCertSSL, cert_path, $[]); + return; +} + +global define void clientKeySSL( string key_path ) ``{ + y2debug("setting clientKeySSL to %1",key_path); + SCR::Execute(.curl.clientKeySSL, key_path, $[]); + return; +} + + /* EOF */ } Modified: trunk/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/package/yast2-transfer.… ============================================================================== --- trunk/transfer/package/yast2-transfer.changes (original) +++ trunk/transfer/package/yast2-transfer.changes Fri Jul 29 14:17:07 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 29 14:16:32 CEST 2011 - ug(a)suse.de + +- add support for client certificates for HTTPS + +------------------------------------------------------------------- Fri Oct 9 14:13:13 CEST 2009 - ug(a)suse.de - 2.18.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] r65084 - /branches/SuSE-Code-11-SP2-Branch/transfer/
by ug＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: ug Date: Fri Jul 29 10:09:20 2011 New Revision: 65084 URL: http://svn.opensuse.org/viewcvs/yast?rev=65084&view=rev Log: - copy from sp1 Added: branches/SuSE-Code-11-SP2-Branch/transfer/ (props changed) - copied from r65083, branches/SuSE-Code-11-SP1-Branch/transfer/ -- 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] r65083 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 29 Jul '11

29 Jul '11

Author: lslezak Date: Fri Jul 29 09:14:37 2011 New Revision: 65083 URL: http://svn.opensuse.org/viewcvs/yast?rev=65083&view=rev Log: - display solver error in the migration propsal, do not allow starting migration when there is an unsolved problem (bnc#708676) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Fri Jul 29 09:14:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 29 07:12:14 UTC 2011 - lslezak(a)suse.cz + +- display solver error in the migration propsal, do not allow + starting migration when there is an unsolved problem (bnc#708676) + +------------------------------------------------------------------- Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz - fixed registration status check when registering against SMT Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Fri Jul 29 09:14:37 2011 @@ -451,7 +451,8 @@ Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); } - Pkg::PkgSolve(true); + // set the solve error flag for packages proposal + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); already_proposed = 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] r65082 - /branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 22:55:11 2011 New Revision: 65082 URL: http://svn.opensuse.org/viewcvs/yast?rev=65082&view=rev Log: improved package manager reset function: - no need to neutralize selected resolvables, after pool reload the status is reset anyway - reset also solver options and DUP repositories Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Thu Jul 28 22:55:11 2011 @@ -126,24 +126,23 @@ ); y2milestone ("Reseting Pkg"); - Pkg::PkgApplReset(); - Pkg::PkgReset(); - symbol status = nil; - string name = nil; + list<integer> repos = Pkg::GetUpgradeRepos(); + if (size(repos) > 0) + { + y2milestone("Resetting upgrade repos config"); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + } - y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { - Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); - }); - - y2milestone ("Running solver"); - Pkg::PkgSolve (true); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); Pkg::TargetFinish(); Pkg::SourceFinishAll(); Wagon::InitPkg(); + + y2milestone ("Running solver"); Pkg::PkgSolve (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] r65081 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 22:50:40 2011 New Revision: 65081 URL: http://svn.opensuse.org/viewcvs/yast?rev=65081&view=rev Log: - reset and repropose package selection when migration type is changed (bnc#708641) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 22:50:40 2011 @@ -5,6 +5,8 @@ (bnc#708888) - properly display selected migration type when going back in the migration workflow (bnc#708667) +- reset and repropose package selection when migration type is + changed (bnc#708641) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 22:50:40 2011 @@ -22,6 +22,7 @@ import "Wizard"; import "Popup"; + include "wagon/common_func.ycp"; define list TableContent() { @@ -195,6 +196,9 @@ symbol ret = nil; + list<integer> prev_dup_repos = Wagon::DupRepos(); + boolean prev_manual_selection = Wagon::ManualRepoSelection(); + while (true) { // go to advanced config it was used previously ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); @@ -286,6 +290,15 @@ } } + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + { + y2milestone("DUP repository config has been changed, repropose package selection"); + Wagon::ResetDUPProposal(); + + // reset current package selection + ResetPackager(); + } + return ret; } -- 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] r65080 - in /trunk/yast2: ./ library/modules/ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:51:20 2011 New Revision: 65080 URL: http://svn.opensuse.org/viewcvs/yast?rev=65080&view=rev Log: Added Assert; fixed INTERFACETYPE=br (bnc#704999). via svn merge -r 65077:65079 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/yast2 Added: trunk/yast2/library/modules/Assert.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp - copied unchanged from r65079, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp Modified: trunk/yast2/ (props changed) trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/ (props changed) trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65080&r1=65079… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 28 16:51:20 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Thu Jul 28 16:51:20 2011 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list<list<string> > TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list<list<string> > TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; 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 28 16:51:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvidner(a)suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.21.8 + +------------------------------------------------------------------- Wed Jul 27 09:29:36 UTC 2011 - lslezak(a)suse.cz - command line - properly display multiline help texts (bnc#708553) -- 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] r65079 - in /branches/SuSE-Code-11-SP2-Branch/yast2: ./ library/network/src/ library/network/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:25:36 2011 New Revision: 65079 URL: http://svn.opensuse.org/viewcvs/yast?rev=65079&view=rev Log: Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). otherwise yast2 lan would erroneously put INTERFACETYPE=br in ifcfg Added test cases, using the new Assert module Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Jul 28 16:25:36 2011 @@ -1 +1 @@ -2.17.104 +2.17.105 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/src/NetworkInterfaces.ycp Thu Jul 28 16:25:36 2011 @@ -182,10 +182,27 @@ list<string> TypeByKeyValue = [ "INTERFACETYPE", - "TUNNEL", ]; list<list<string> > TypeByKeyExistence = [ ["ETHERDEVICE", "vlan"], + ["WIRELESS_MODE", "wlan"], + ["MODEM_DEVICE", "ppp"], + ]; +list<list<string> > TypeByValueMatch = [ + ["BONDING_MASTER", "yes", "bond"], + ["BRIDGE", "yes", "br"], + ["WIRELESS", "yes", "wlan"], + ["TUNNEL", "tap", "tap"], + ["TUNNEL", "tun", "tun"], + ["TUNNEL", "sit", "sit"], + ["TUNNEL", "gre", "gre"], + ["TUNNEL", "ipip", "ipip"], + ["PPPMODE", "pppoe", "ppp"], + ["PPPMODE", "pppoatm", "ppp"], + ["PPPMODE", "capi-adsl", "ppp"], + ["PPPMODE", "pptp", "ppp"], + ["ENCAP", "syncppp", "isdn"], + ["ENCAP", "rawip", "isdn"], ]; /** @@ -193,6 +210,14 @@ */ global string GetTypeFromIfcfg(ifcfg_t ifcfg) { string type = nil; // unknown + foreach(list<string> key_type, TypeByValueMatch, { + string rule_key = key_type[0]:""; + string rule_value = key_type[1]:""; + string rule_type = key_type[2]:""; + if (ifcfg[rule_key]:"" == rule_value) { + type = rule_type; + } + }); foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.out Thu Jul 28 16:25:36 2011 @@ -0,0 +1,4 @@ +Dump NetworkInterfaces::GetTypeFromIfcfg +Return true +Return true +Return true Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces5-Type.ycp Thu Jul 28 16:25:36 2011 @@ -0,0 +1,40 @@ +// bnc#704999 +{ + +include "testsuite.ycp"; +import "Assert"; +import "NetworkInterfaces"; + +typedef map<string, any> ifcfg_t; + +ifcfg_t mybond = $[ + "BOOTPROTO": "dhcp", + "BONDING_MASTER": "yes", + "BONDING_SLAVE_0": "eth0", + "BONDING_SLAVE_1": "eth1", +]; + +ifcfg_t mybridged = $[ + "BOOTPROTO": "dhcp", + "BRIDGE": "yes", + "BRIDGE_PORTS": "eth0 tap0", +]; + +ifcfg_t myvirt = $[ + "BOOTPROTO": "static", + "TUNNEL": "tap", +]; + +DUMP("NetworkInterfaces::GetTypeFromIfcfg"); +TEST(``( + Assert::Equal("bond", NetworkInterfaces::GetTypeFromIfcfg(mybond)) + ), [], nil); +TEST(``( + Assert::Equal("br", NetworkInterfaces::GetTypeFromIfcfg(mybridged)) + ), [], nil); +TEST(``( + Assert::Equal("tap", NetworkInterfaces::GetTypeFromIfcfg(myvirt)) + ), [], nil); + +/*EOF*/ +} Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Jul 28 16:25:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 16:23:46 CEST 2011 - mvidner(a)suse.cz + +- Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). +- 2.17.105 + +------------------------------------------------------------------- Thu Jul 28 13:46:22 CEST 2011 - jsuchome(a)suse.cz - adapt the message shown when compliance check fails -- 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] r65078 - /branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp
by mvidner＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: mvidner Date: Thu Jul 28 16:25:30 2011 New Revision: 65078 URL: http://svn.opensuse.org/viewcvs/yast?rev=65078&view=rev Log: New module: Assert Assert::Equal(readability, good); Assert::EqualMsg(0, user_id, "you must be root to run these tests"); Assert::Equal("Oh Assert, how could I have lived without you so long?", Mode::mood()); Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp (with props) Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Assert.ycp Thu Jul 28 16:25:30 2011 @@ -0,0 +1,36 @@ +/** + * File: Assert.ycp + * Summary: Assertions for test cases + * Authors: Martin Vidner <mvidner(a)suse.cz> + */ +{ +module "Assert"; + +/** + * @param expected expected value of test + * @param actual actual value of test + * @param fail_message will be logged if test fails + * @return whether test succeeds + */ +global boolean EqualMsg(any expected, any actual, string fail_message) { + if (expected == actual) { + return true; + } + else { + y2error ("%1", fail_message); + return false; + } +} + +/** + * @param expected expected value of test + * @param actual actual value of test + * @return whether test succeeds + */ +global boolean Equal(any expected, any actual) { + string fail_message = sformat ("assertion failure, expected '%1', got '%2'", expected, actual); + return EqualMsg(expected, actual, fail_message); +} + +/* EOF */ +} -- 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] r65077 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 15:04:22 2011 New Revision: 65077 URL: http://svn.opensuse.org/viewcvs/yast?rev=65077&view=rev Log: - properly display selected migration type when going back in the migration workflow (bnc#708667) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 15:04:22 2011 @@ -3,6 +3,8 @@ - fixed registration status check when registering against SMT (bnc#708888) +- properly display selected migration type when going back in + the migration workflow (bnc#708667) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 15:04:22 2011 @@ -154,6 +154,8 @@ { // heading text string heading_text = _("Migration Type"); + // full migration? + boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); term contents = `VBox( // frame label @@ -163,9 +165,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"), full)) ) ) ) @@ -194,7 +196,8 @@ symbol ret = nil; while (true) { - ret = (symbol)UI::UserInput(); + // go to advanced config it was used previously + ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); if (ret == `next) { @@ -207,6 +210,7 @@ // DUP: all repositories y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + Wagon::SetManualRepoSelection(false); } else if (mtype == `minimal) { @@ -229,6 +233,7 @@ y2milestone("Converted aliases to ids: %1", added_repos); Wagon::SetDupRepos(added_repos); + Wagon::SetManualRepoSelection(false); } else { @@ -255,14 +260,20 @@ y2milestone("Manual DUP repository selection selected"); ret = DupSelectionDialog(); - if (ret == `abort || ret == `close || ret == `next) + if (ret == `abort || ret == `close) { break; } + else if (ret == `next) + { + Wagon::SetManualRepoSelection(true); + break; + } else if (ret == `back) { // refresh the dialog SetMigrationSelectionDialogContent(); + Wagon::SetManualRepoSelection(false); } else { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Jul 28 15:04:22 2011 @@ -123,6 +123,20 @@ dup_repos = repos; } + boolean manual_repo_selection = false; + + // manual or automatic DUP repo selection? + global boolean ManualRepoSelection() + { + return manual_repo_selection; + } + + global void SetManualRepoSelection(boolean manual) + { + y2milestone("Manual DUP repo selection: %1", manual); + manual_repo_selection = manual; + } + // list of repositories (aliases) added by suse_register list<string> new_registration_repos = []; -- 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] r65076 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/clients/wagon_registration_check.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 13:59:36 2011 New Revision: 65076 URL: http://svn.opensuse.org/viewcvs/yast?rev=65076&view=rev Log: - fixed registration status check when registering against SMT (bnc#708888) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 13:59:36 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when registering against SMT + (bnc#708888) + +------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak(a)suse.cz - added new core/full migration selection dialog Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp Thu Jul 28 13:59:36 2011 @@ -232,6 +232,14 @@ // some other problem and user has to be informed about it define boolean Interactive(map<string,any> status) { + // SMT doesn't write /var/lib/suseRegister/registration-status.xml file + // so we cannot get any registration details, assume the system is fully registered + if (status["ncc"]:nil == false) + { + y2milestone("SMT server is used, assuming fully registered system"); + return false; + } + // the system is not registered at all if (status["registered_system"]:false) { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Jul 28 13:59:36 2011 @@ -761,6 +761,50 @@ return true; } + /** + * Check whether NCC or SMT is used for registration + */ + define boolean NCCUsed() + { + // check /etc/suseRegister.conf content + string conf = (string)SCR::Read(.target.string, "/etc/suseRegister.conf"); + + if (conf == nil) + { + y2error("Cannot read /etc/suseRegister.conf"); + return nil; + } + + list<string> lines = splitstring(conf, "\n"); + + boolean found_url = false; + boolean found_ncc = false; + + foreach(string line, lines, { + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*")) + { + found_url = true; + y2milestone("Found registration URL option: %1", line); + + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*https://secure-www.novell.com/center/regsvc/*[ \t]*(#*.*)*")) + { + found_ncc = true; + y2milestone("NCC URL found"); + } + } + }); + + if (!found_url) + { + y2error("No url option found in /etc/suseRegister.conf"); + return nil; + } + + y2milestone("Found NCC registration server: %1", found_ncc); + + return found_ncc; + } + /* * Read registration status and sort products according their status * @param file Read this registration status file @@ -873,6 +917,7 @@ * @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 + "ncc" : (boolean) - true - NCC is used for registration, false - a SMT server is configured, nil - not configured or other error "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) @@ -884,7 +929,10 @@ */ global define map<string,any> RegistrationStatus() { - return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + map<string,any> ret = RegistrationStatusFromFile(RegistrationStatus::RegFile()); + ret["ncc"] = NCCUsed(); + + return ret; } /* EOF */ } -- 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] r65075 - in /branches/SuSE-Code-11-SP2-Branch/wagon: ./ agents/ doc/ doc/autodocs/ src/ src/clients/ src/config/ src/include/ src/modules/ testsuite/
by lslezak＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: lslezak Date: Thu Jul 28 13:56:18 2011 New Revision: 65075 URL: http://svn.opensuse.org/viewcvs/yast?rev=65075&view=rev Log: updated snv:ignore properties Modified: branches/SuSE-Code-11-SP2-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/agents/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/doc/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/doc/autodocs/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/config/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/include/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/ (props changed) -- 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] r65074 - /tags/branch-Code-11-SP2-2_17_104/yast2/
by jsuchome＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: jsuchome Date: Thu Jul 28 13:51:20 2011 New Revision: 65074 URL: http://svn.opensuse.org/viewcvs/yast?rev=65074&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 for yast2 Added: tags/branch-Code-11-SP2-2_17_104/yast2/ (props changed) - copied from r65073, branches/SuSE-Code-11-SP2-Branch/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] r65073 - in /branches/SuSE-Code-11-SP2-Branch/yast2: VERSION library/control/src/ProductProfile.ycp package/yast2.changes
by jsuchome＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: jsuchome Date: Thu Jul 28 13:51:12 2011 New Revision: 65073 URL: http://svn.opensuse.org/viewcvs/yast?rev=65073&view=rev Log: - adapt the message shown when compliance check fails - 2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Thu Jul 28 13:51:12 2011 @@ -1 +1 @@ -2.17.103 +2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp Thu Jul 28 13:51:12 2011 @@ -180,12 +180,8 @@ } }); string reasons_s = mergestring (reasons, "\n"); - // popup message, %1 is list of problems - string question = sformat (_("The system is not compliant with provided profile: - - %1 - -Do you want to continue or abort the installation?"), reasons_s); + // last part of the question (variable) + string end_question = _("Do you want to continue or abort the installation?"); // button label string continue_button =_("&Continue Installation"); @@ -195,12 +191,8 @@ // checking specific product if (productId != nil) { - // popup message, %1 is list of problems - question = sformat (_("The system is not compliant with provided profile: - - %1 - -Do you want to add new product anyway?"), reasons_s); + // last part of the question (variable) + end_question = _("Do you want to add new product anyway?"); continue_button = Label::YesButton (); cancel_button = Label::NoButton (); } @@ -208,7 +200,16 @@ boolean ret = Report::AnyQuestion ( // popup dialog caption _("Warning"), - question, + // popup message, %1 is list of problems + sformat (_("The profile does not allow you to run the products on this system. +Proceeding to run this installation will leave you in an unsupported state +and might impact your compliance requirements. + +The following requirements are not fulfilled on this system: + +%1 + +%2"), reasons_s, end_question), continue_button, cancel_button, `no_button ); Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Thu Jul 28 13:51:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 13:46:22 CEST 2011 - jsuchome(a)suse.cz + +- adapt the message shown when compliance check fails +- 2.17.104 + +------------------------------------------------------------------- Wed Jul 27 09:29:36 UTC 2011 - lslezak(a)suse.cz - command line - properly display multiline help texts (bnc#708553) -- 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] r65072 - /tags/branch-Code-11-SP2-2_17_7/fcoe-client/
by gs＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: gs Date: Thu Jul 28 13:32:53 2011 New Revision: 65072 URL: http://svn.opensuse.org/viewcvs/yast?rev=65072&view=rev Log: Created tag branch-Code-11-SP2-2_17_7 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_7/fcoe-client/ - copied from r65071, 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] r65071 - /tags/branch-Code-11-SP2-2_17_7/
by gs＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: gs Date: Thu Jul 28 13:32:52 2011 New Revision: 65071 URL: http://svn.opensuse.org/viewcvs/yast?rev=65071&view=rev Log: Created tag branch-Code-11-SP2-2_17_7 Added: tags/branch-Code-11-SP2-2_17_7/ -- 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] r65070 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: gs Date: Thu Jul 28 13:32:32 2011 New Revision: 65070 URL: http://svn.opensuse.org/viewcvs/yast?rev=65070&view=rev Log: Set up network interfaces during installation (bnc #705171) - V 2.17.7 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 28 13:32:32 2011 @@ -1 +1 @@ -2.17.6 +2.17.7 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 28 13:32:32 2011 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jul 27 14:46:09 CEST 2011 - gs(a)suse.de -- Configure the interfaces during installation (bnc #705171) +- Set up network interfaces during installation (bnc #705171) +- V 2.17.7 ------------------------------------------------------------------- Thu Jul 21 14:09:17 CEST 2011 - gs(a)suse.de -- 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] r65069 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: gs Date: Thu Jul 28 13:28:50 2011 New Revision: 65069 URL: http://svn.opensuse.org/viewcvs/yast?rev=65069&view=rev Log: improve 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 Thu Jul 28 13:28:50 2011 @@ -92,7 +92,7 @@ "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: @@ -125,9 +125,10 @@ 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 - required." ), +FCoE Enable: yes or no +Enable or disable the creation of FCoE instances. +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