Author: locilka Date: Mon Nov 5 13:46:12 2007 New Revision: 41796 URL: http://svn.opensuse.org/viewcvs/yast?rev=41796&view=rev Log: Some more fixes Dirinstall::* -> Installation::* Modified: trunk/packager/src/clients/inst_kickoff.ycp trunk/packager/src/clients/inst_rpmcopy.ycp trunk/packager/src/clients/software_proposal.ycp Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickoff.ycp?rev=41796&r1=41795&r2=41796&view=diff ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Mon Nov 5 13:46:12 2007 @@ -19,7 +19,6 @@ import "Popup"; import "Directory"; import "ModuleLoading"; - import "DirInstall"; import "Initrd"; import "Kernel"; import "Arch"; @@ -336,7 +335,7 @@ SCR::Execute(.target.mkdir, Installation::destdir + Directory::logdir); // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { string template_dir= "/var/adm/fillup-templates"; // hack 'pre-req' cyclic dependency between bash, aaa_base, and perl Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcopy.ycp?rev=41796&r1=41795&r2=41796&view=diff ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Mon Nov 5 13:46:12 2007 @@ -30,7 +30,6 @@ import "SlideShowCallbacks"; import "AutoinstSoftware"; import "Popup"; - import "DirInstall"; import "Report"; import "Kernel"; import "Service"; @@ -829,7 +828,7 @@ ret["current_cd_no"] = 0; ret["maxnumbercds"] = 0; y2milestone("StartingAndMaxMediaNumber: Stage cont %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); - } else if (DirInstall::installing_into_dir) { + } else if (Installation::dirinstall_installing_into_dir) { // All in one ret["current_cd_no"] = 0; // was 1 ret["maxnumbercds"] = 0; // was 10 Modified: trunk/packager/src/clients/software_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/software_proposal.ycp?rev=41796&r1=41795&r2=41796&view=diff ============================================================================== --- trunk/packager/src/clients/software_proposal.ycp (original) +++ trunk/packager/src/clients/software_proposal.ycp Mon Nov 5 13:46:12 2007 @@ -14,8 +14,8 @@ textdomain "packager"; import "Packages"; - import "DirInstall"; import "Language"; + import "Installation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -29,15 +29,15 @@ boolean reinit = false; boolean partition_changed = false; - if (DirInstall::installing_into_dir) + if (Installation::dirinstall_installing_into_dir) { // check the target directory in dirinstall mode - if ( Packages::timestamp != DirInstall::GetTargetChangeTime() ) + if ( Packages::timestamp != Installation::dirinstall_target_time ) { partition_changed = true; } // save information about target change time in module Packages - Packages::timestamp = DirInstall::GetTargetChangeTime(); + Packages::timestamp = Installation::dirinstall_target_time; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org