November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41976 - in /trunk/country: VERSION console/data/consolefonts.ycp language/data/country.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 16:04:23 2007 New Revision: 41976 URL: http://svn.opensuse.org/viewcvs/yast?rev=41976&view=rev Log: - reverted console font for Hungarian (#335246) - added Liechtenstein to the list of countries (#230491) - 2.16.2 Modified: trunk/country/VERSION trunk/country/console/data/consolefonts.ycp trunk/country/language/data/country.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=41976&r1=419… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Nov 12 16:04:23 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/country/console/data/consolefonts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/console/data/consolefont… ============================================================================== --- trunk/country/console/data/consolefonts.ycp (original) +++ trunk/country/console/data/consolefonts.ycp Mon Nov 12 16:04:23 2007 @@ -80,9 +80,9 @@ "sk" : [ "lat2-16.psfu", "", "trivial", "(K" ], "sk_SK.UTF-8" : [ "lat2-16.psfu", "", "trivial", "(K" ], - "hu_HU" : [ "lat2a-16.psfu", "", "trivial", "(K" ], - "hu" : [ "lat2a-16.psfu", "", "trivial", "(K" ], - "hu_HU.UTF-8" : [ "lat2a-16.psfu", "", "trivial", "(K" ], + "hu_HU" : [ "lat2-16.psfu", "", "trivial", "(K" ], + "hu" : [ "lat2-16.psfu", "", "trivial", "(K" ], + "hu_HU.UTF-8" : [ "lat2-16.psfu", "", "trivial", "(K" ], "lt_LT" : [ "lat7a-16.psf", "", "trivial", "(K" ], "lt" : [ "lat7a-16.psf", "", "trivial", "(K" ], Modified: trunk/country/language/data/country.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/data/country.yc… ============================================================================== --- trunk/country/language/data/country.ycp (original) +++ trunk/country/language/data/country.ycp Mon Nov 12 16:04:23 2007 @@ -61,6 +61,7 @@ "JP" : _("Japan"), "KW" : _("Kuwait"), "LB" : _("Lebanon"), + "LI" : _("Liechtenstein"), "LT" : _("Lithuania"), "LU" : _("Luxemburg"), "LV" : _("Latvia"), Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Nov 12 16:04:23 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 12 15:55:00 CET 2007 - jsuchome(a)suse.cz + +- reverted console font for Hungarian (#335246) +- added Liechtenstein to the list of countries (#230491) +- 2.16.2 + +------------------------------------------------------------------- Mon Nov 5 13:27:16 CET 2007 - jsuchome(a)suse.cz - added Atlantic/Canary timezone (#303710) -- 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] r41975 - in /branches/tmp/sh/mod-ui/web-wt/src: YWebUI_core.cc YWebWidgetFactory.cc
by visnov＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: visnov Date: Mon Nov 12 15:59:28 2007 New Revision: 41975 URL: http://svn.opensuse.org/viewcvs/yast?rev=41975&view=rev Log: added all missing methods, web UI loads and fails Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Mon Nov 12 15:59:28 2007 @@ -38,7 +38,8 @@ using namespace Wt; YWebUI * YWebUI::_ui = 0; - +int YWebUI::_argc = 0; +char ** YWebUI::_argv = 0L; YWebUI::YWebUI( const Wt::WEnvironment& env, const char * macro_file ) : WApplication(env), Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Mon Nov 12 15:59:28 2007 @@ -77,10 +77,10 @@ // Layout Boxes // - YLayoutBox * YWebWidgetFactory::createVBox ( YWidget * parent ){} - YLayoutBox * YWebWidgetFactory::createHBox ( YWidget * parent ){} + YLayoutBox * YWebWidgetFactory::createVBox ( YWidget * parent ){} + YLayoutBox * YWebWidgetFactory::createHBox ( YWidget * parent ){} YLayoutBox * YWebWidgetFactory::createLayoutBox ( YWidget * parent, YUIDimension dimension ) {} - + YAlignment * YWebWidgetFactory::createAlignment ( YWidget * parent, YAlignmentType horAlignment, YAlignmentType vertAlignment ) {} // // Common Leaf Widgets // -- 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] r41974 - in /branches/tmp/sh/mod-ui/web-wt/src: YWebUI.h YWebUIComponent.h YWebUI_core.cc
by visnov＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: visnov Date: Mon Nov 12 15:55:00 2007 New Revision: 41974 URL: http://svn.opensuse.org/viewcvs/yast?rev=41974&view=rev Log: - create a listen thread to create sessions - YWebUI inherits WApplication now - removed not implemented methods for now Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h branches/tmp/sh/mod-ui/web-wt/src/YWebUIComponent.h branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h Mon Nov 12 15:55:00 2007 @@ -23,6 +23,8 @@ #include "YSimpleEventHandler.h" #include <YUI.h> +#include <WApplication> + class YEvent; class YWebOptionalWidgetFactory; class YWebWidgetFactory; @@ -31,16 +33,14 @@ using std::vector; -class YWebUI: public YUI +class YWebUI: public Wt::WApplication, public YUI { public: /** * Constructor. **/ - YWebUI( int argc, - char ** argv, - bool with_threads, + YWebUI( const Wt::WEnvironment& env, const char * macro_file ); /** @@ -310,25 +310,6 @@ const string & filter, const string & headline ); - /** - * Convert logical layout spacing units into device dependent units. - * A default size dialog is assumed to be 80x25 layout spacing units - * and 640x480 device dependent spacing units. - * - * Reimplemented from YUI. - **/ - virtual int deviceUnits( YUIDimension dim, float layout_units ); - - /** - * Convert device dependent units into logical layout spacing units. - * A default size dialog is assumed to be 80x25 layout spacing units - * and 640x480 device dependent spacing units. - * - * Reimplemented from YUI. - **/ - virtual float layoutUnits( YUIDimension dim, int device_units ); - - protected: /** @@ -336,12 +317,6 @@ * [Reimplemented from YUI] * See UI builtin GetDisplayInfo() doc for details. **/ - int getDisplayWidth(); - int getDisplayHeight(); - int getDisplayDepth(); - long getDisplayColors(); - int getDefaultWidth(); - int getDefaultHeight(); bool textMode() { return false; } bool hasImageSupport() { return true; } bool hasLocalImageSupport() { return false; } @@ -414,6 +389,9 @@ **/ YSimpleEventHandler _event_handler; +public: + static int _argc; + static char** _argv; }; Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUIComponent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUIComponent.h (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUIComponent.h Mon Nov 12 15:55:00 2007 @@ -21,8 +21,13 @@ #define YWebUIComponent_h #include <YUIComponent.h> + +#define y2log_component "web-ui" +#include <ycp/y2log.h> + #include "YWebUI.h" +extern void *start_webserver_thread( void * yui ); class YWebUIComponent : public YUIComponent { @@ -37,7 +42,28 @@ **/ virtual YUI * createUI( int argc, char **argv, bool with_threads, const char * macro_file ) { - return new YWebUI( argc, argv, with_threads, macro_file ); + // save the arguments for the UI thread (http server args etc) + YWebUI::_argc = argc; + YWebUI::_argv = argv; + + pthread_t webserver_thread; + pthread_attr_t attr; + pthread_attr_init( & attr ); + + if( pthread_create( & webserver_thread, & attr, start_webserver_thread, 0 ) > 0 ) + { + y2internal ("Could not create Web server thread, aborting"); + abort(); + } + + y2milestone( "Server thread running"); + + // wait until the UI thread is ready + while (! YWebUI::ui() ) + { + sleep( 1 ); + } + return YWebUI::ui(); } /** Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Mon Nov 12 15:55:00 2007 @@ -27,24 +27,29 @@ #include <ycp/y2log.h> #include <yui/YApplication.h> +#include <WApplication> + #include "YWebUI.h" #include "YWebWidgetFactory.h" #include "YWebOptionalWidgetFactory.h" #include "YEvent.h" #include "YUISymbols.h" +using namespace Wt; + YWebUI * YWebUI::_ui = 0; -YWebUI::YWebUI( int argc, char **argv, bool with_threads, const char * macro_file ) - : YUI( with_threads ) +YWebUI::YWebUI( const Wt::WEnvironment& env, const char * macro_file ) + : WApplication(env), + YUI( true /* with_threads */ ) , _main_dialog_id(0) , _do_exit_loop( false ) { _ui = this; _fatal_error = false; - processCommandLineArgs( argc, argv ); +// processCommandLineArgs( argc, argv ); topmostConstructorHasFinished(); } @@ -232,5 +237,53 @@ } +WApplication *createApplication(const WEnvironment& env) +{ + // Instantiate the Wt application. + YWebUI *appl = new YWebUI( env, 0 ); + + // Set window title + + std::string title( "YaST2" ); + char hostname[ MAXHOSTNAMELEN+1 ]; + + if ( gethostname( hostname, sizeof( hostname )-1 ) == 0 ) + { + hostname[ sizeof( hostname ) -1 ] = '\0'; // make sure it's terminated + + if ( strlen( hostname ) > 0 ) + { + if ( ( strcmp( hostname, "(none)" ) != 0 && + strcmp( hostname, "linux" ) != 0 ) + ) + { + title += "@"; + title += hostname; + } + } + } + + y2milestone( "Created WApplication (%p)", appl ); + + // Set application title + appl->setTitle(title); + +#if 0 + // Set up a timer for handling YaST requests + appl->createTimer(); + + _wtimer_work = true; +#endif + + return appl; +} +void *start_webserver_thread( void * yui ) +{ + // FIXME: do the work + YWebUI* ui = (YWebUI*)yui; + WRun(ui->_argc, ui->_argv, &createApplication); + + return 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] r41973 - /tags/stable-2_16_2/ldap-client/
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 15:30:38 2007 New Revision: 41973 URL: http://svn.opensuse.org/viewcvs/yast?rev=41973&view=rev Log: Created tag stable-2_16_2 for ldap-client Added: tags/stable-2_16_2/ldap-client/ - copied from r41972, trunk/ldap-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] r41972 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 15:30:32 2007 New Revision: 41972 URL: http://svn.opensuse.org/viewcvs/yast?rev=41972&view=rev Log: - do not override user modifications when creating default objects (#339232) - 2.16.2 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=41972&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Mon Nov 12 15:30:32 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 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 Mon Nov 12 15:30:32 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 12 14:43:40 CET 2007 - jsuchome(a)suse.cz + +- do not override user modifications when creating default objects + (#339232) +- 2.16.2 + +------------------------------------------------------------------- Wed Oct 24 16:15:42 CEST 2007 - jsuchome(a)suse.cz - if crypted connection is switched off, adapt the checkbox value Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=419… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Mon Nov 12 15:30:32 2007 @@ -2060,14 +2060,16 @@ }); // create user configuration object - if (GetLDAPEntry (user_dn) == $[]) + if (config_modules[user_dn]:$[] == $[] && + GetLDAPEntry (user_dn) == $[]) { modules [user_dn] = CreateModule ( get_cn (user_dn), "suseuserconfiguration"); } // create group configuration object - if (GetLDAPEntry (group_dn) == $[]) + if (config_modules[group_dn]:$[] == $[] && + GetLDAPEntry (group_dn) == $[]) { modules [group_dn] = CreateModule ( get_cn (group_dn), "susegroupconfiguration"); @@ -2087,7 +2089,8 @@ update_modules = true; } - if (GetLDAPEntry (template_dn) == $[]) + if (templates[template_dn]:$[] == $[] && + GetLDAPEntry (template_dn) == $[]) { templs [template_dn] = CreateTemplate ( get_cn (template_dn), ["suseuserconfiguration"]); @@ -2103,7 +2106,8 @@ update_modules = true; } - if (GetLDAPEntry (template_dn) == $[]) + if (templates[template_dn]:$[] == $[] && + GetLDAPEntry (template_dn) == $[]) { templs [template_dn] = CreateTemplate ( get_cn (template_dn), ["susegroupconfiguration"]); -- 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] r41971 - /tags/stable-2_16_8/network/
by mzugec＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: mzugec Date: Mon Nov 12 15:21:29 2007 New Revision: 41971 URL: http://svn.opensuse.org/viewcvs/yast?rev=41971&view=rev Log: Created tag stable-2_16_8 for network Added: tags/stable-2_16_8/network/ - copied from r41970, 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] r41970 - in /trunk/network: VERSION package/yast2-network.changes src/installation/manual-tests/hostname.ycp src/services/dns.ycp
by mzugec＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: mzugec Date: Mon Nov 12 15:21:18 2007 New Revision: 41970 URL: http://svn.opensuse.org/viewcvs/yast?rev=41970&view=rev Log: the hostname dialog proposes to update it by DHCP on a laptop (#326102) Added: trunk/network/src/installation/manual-tests/hostname.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/dns.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41970&r1=419… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Nov 12 15:21:18 2007 @@ -1 +1 @@ -2.16.7 +2.16.8 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 Mon Nov 12 15:21:18 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 12 15:18:38 CET 2007 - mzugec(a)suse.cz + +- the hostname dialog proposes to update it by DHCP on a laptop + (#326102) +- 2.16.8 + +------------------------------------------------------------------- Fri Nov 9 14:45:11 CET 2007 - kmachalkova(a)suse.cz - host.rnc modified to accept empty <host> section as a valid one Added: trunk/network/src/installation/manual-tests/hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/manual-… ============================================================================== --- trunk/network/src/installation/manual-tests/hostname.ycp (added) +++ trunk/network/src/installation/manual-tests/hostname.ycp Mon Nov 12 15:21:18 2007 @@ -0,0 +1,13 @@ +// Author: Michal Zugec +// $Id$ + +// this file is for development only +// running this file starts the internet test dialogs +{ + // include "../dialogs.ycp"; + import "Wizard"; + + Wizard::CreateDialog(); + WFM::CallFunction ("inst_hostname"); + Wizard::CloseDialog(); +} Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Mon Nov 12 15:21:18 2007 @@ -148,6 +148,8 @@ define void InitDhcpHostname (string key) { UI::ChangeWidget (`id("DHCP_HOSTNAME"), `Enabled, has_dhcp); if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("no interface with dhcp"))); + // the hostname dialog proposes to update it by DHCP on a laptop (#326102) + else UI::ChangeWidget(`id("DHCP_HOSTNAME"), `Value, hn_settings["DHCP_HOSTNAME"]:true); return 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] r41969 - in /trunk/product-creator: package/yast2-product-creator.changes src/Kiwi.ycp src/complex.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 15:19:15 2007 New Revision: 41969 URL: http://svn.opensuse.org/viewcvs/yast?rev=41969&view=rev Log: - image-creator: do not allow importing non-system configurations (#340495) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/complex.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Nov 12 15:19:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 12 13:11:58 CET 2007 - jsuchome(a)suse.cz + +- image-creator: + do not allow importing non-system configurations (#340495) + +------------------------------------------------------------------- Fri Nov 9 17:04:59 CET 2007 - lslezak(a)suse.cz - y2mkiso - updated and enhanced help text (#336821) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Mon Nov 12 15:19:15 2007 @@ -309,7 +309,7 @@ ret["xen_disk"] = packages["xen","disk"]:""; if (packages["xen","memory"]:"" != "") ret["xen_memory"] = tointeger (packages["xen","memory"]:"512"); - foreach (string key, [ "author", "contact", "specification", + foreach (string key, [ "author", "contact", "image_type", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", "schemeversion", "defaultroot", "inherit", "locale"], @@ -795,7 +795,9 @@ { string name = config["name"]:""; string ver = config["version"]:""; - if (name_version[name]:"" == ver) + if (config["image_type"]:"" != "system") + y2warning ("%1 not a 'system' image type, skipping", name); + else if (name_version[name]:"" == ver) y2warning ("template %1,%2 already imported", name, ver); else { Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Mon Nov 12 15:19:15 2007 @@ -578,6 +578,11 @@ if (FileUtils::Exists (images_dir + "/" + d + "/config.xml")) { map config = Kiwi::ReadConfigXML (images_dir + "/" + d); + if (config["image_type"]:"" != "system") + { + y2warning ("%1 not a 'system' image type, skipping", d); + return; + } string task = "iso"; // FIXME duplicated in kiwi_dialogs foreach (string type, map data, config["type"]:$[], { Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Nov 12 15:19:15 2007 @@ -1573,11 +1573,20 @@ // read the new configuration and update UI accordingly // (no need to read config if it is provided as argument) - void update_config (string dir, map config) { + boolean update_config (string dir, map config) { kiwi_configuration = dir; Config = (config == $[] ? Kiwi::ReadConfigXML (kiwi_configuration) : config); + + if (Config["image_type"]:"" != "system") + { + y2warning ("%1 does not have 'system' image type, skipping", dir); + // error popup + Popup::Error (_("Selected directory does not contain valid description of system configuration")); + return false; + } + // busy popup Popup::ShowFeedback (_("Importing repositories..."), _("Please wait...")); repositories = Kiwi::ImportImageRepositories (Config, dir); @@ -1611,6 +1620,7 @@ }); UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); + return true; } list template_items = maplist (string dir, map template, Kiwi::Templates, { @@ -1736,10 +1746,9 @@ kiwi_configuration== "" ? Kiwi::images_dir : kiwi_configuration, // popup for file selection dialog _("Directory to Import")); - if (dir!= nil) + if (dir!= nil && update_config (dir, $[])) { UI::ChangeWidget (`id (`import_dir), `Value, dir); - update_config (dir, $[]); } } else if (ret == `template) @@ -1747,7 +1756,8 @@ string dir = (string) UI::QueryWidget (`id (`template), `Value); update_config (dir, Kiwi::Templates[dir]:$[]); } - else if (is (ret, string)) // system repository selected + else if (is (ret, string) && // system repository selected + ret != "rb_dir" && ret != "rb_new") { map system_repo = Kiwi::initial_repositories[(string)ret]:$[]; if (!haskey (repositories, (string)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] r41968 - /trunk/registration/src/clients/inst_suse_register.ycp
by jdsn＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jdsn Date: Mon Nov 12 14:49:35 2007 New Revision: 41968 URL: http://svn.opensuse.org/viewcvs/yast?rev=41968&view=rev Log: caption string made translatable Modified: trunk/registration/src/clients/inst_suse_register.ycp Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Mon Nov 12 14:49:35 2007 @@ -99,7 +99,8 @@ string nccc_success_msg = _("Your configuration was successful."); string nccc_success_server_added = _("An update server has been added to your configuration."); string nccc_error_no_server_added = _("No update server could be added to your configuration."); - string success_detail_label =("New Update Server"); + /* caption for details view */ + string success_detail_label =_("New Update Server"); /* strings for manual interaction popup */ string mi_required = _("Manual Interaction 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] r41967 - /tags/branch-SLE-10-SP1-2_13_23/product-creator/
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 14:07:39 2007 New Revision: 41967 URL: http://svn.opensuse.org/viewcvs/yast?rev=41967&view=rev Log: Created tag branch-SLE-10-SP1-2_13_23 for product-creator Added: tags/branch-SLE-10-SP1-2_13_23/product-creator/ - copied from r41966, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0