Author: lslezak Date: Mon Jul 4 13:38:03 2011 New Revision: 64720 URL: http://svn.opensuse.org/viewcvs/yast?rev=64720&view=rev Log: wagon - if the system is managed by SUSE Manager display a message and exit (fate#311994) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_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/package/yast2-wagon.changes?rev=64720&r1=64719&r2=64720&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Mon Jul 4 13:38:03 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 4 11:28:46 UTC 2011 - lslezak@suse.cz + +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) + +------------------------------------------------------------------- Fri Jul 1 11:11:48 UTC 2011 - lslezak@suse.cz - fixed help text in migration repository selection dialog Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp?rev=64720&r1=64719&r2=64720&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/welcome_in_wagon.ycp Mon Jul 4 13:38:03 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) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org