On Po 4. Júl 2011 13:38:34 [email protected] wrote: > Author: lslezak > Date: Mon Jul 4 13:38:33 2011 > New Revision: 64721 > > URL: http://svn.opensuse.org/viewcvs/yast?rev=64721&view=rev > Log: > wagon - if the system is managed by SUSE Manager display a message and exit > (fate#311994)
What about creating a library out of this functionality? Stano > > Modified: > trunk/wagon/package/yast2-wagon.changes > trunk/wagon/src/clients/welcome_in_wagon.ycp > > Modified: trunk/wagon/package/yast2-wagon.changes > URL: > http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.chang > es?rev=64721&r1=64720&r2=64721&view=diff > ========================================================================== > ==== --- trunk/wagon/package/yast2-wagon.changes (original) > +++ trunk/wagon/package/yast2-wagon.changes Mon Jul 4 13:38:33 2011 > @@ -1,4 +1,10 @@ > ------------------------------------------------------------------- > +Mon Jul 4 11:28:46 UTC 2011 - [email protected] > + > +- if the system is managed by SUSE Manager display a message > + and exit (fate#311994) > + > +------------------------------------------------------------------- > Fri Jul 1 08:52:27 UTC 2011 - [email protected] > > - .spec file - fixed file list > > Modified: trunk/wagon/src/clients/welcome_in_wagon.ycp > URL: > http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/welcome_in_wa > gon.ycp?rev=64721&r1=64720&r2=64721&view=diff > ========================================================================== > ==== --- trunk/wagon/src/clients/welcome_in_wagon.ycp (original) > +++ trunk/wagon/src/clients/welcome_in_wagon.ycp Mon Jul 4 13:38:33 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: [email protected] For additional commands, e-mail: [email protected]
