Mailinglist Archive: yast-commit (1339 mails)

[lslezak@xxxxxxxxxxxxxxxx]

Author: lslezak
Date: Fri Apr 18 09:38:10 2008
New Revision: 46817

URL: http://svn.opensuse.org/viewcvs/yast?rev=46817&view=rev
Log:
- do not create a copy of the installation source
- select a product for installation - preselect dependent patterns
- do not store the config when abort is pressed
- code clean up (bnc#379154)
- 2.16.2

Modified:
    trunk/dirinstall/VERSION
    trunk/dirinstall/package/yast2-dirinstall.changes
    trunk/dirinstall/src/clients/dirinstall.ycp
    trunk/dirinstall/src/clients/inst_dirinstall.ycp
    trunk/dirinstall/src/include/ui.ycp
    trunk/dirinstall/src/modules/DirInstall.ycp

Modified: trunk/dirinstall/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/VERSION?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/VERSION (original)
+++ trunk/dirinstall/VERSION Fri Apr 18 09:38:10 2008
@@ -1 +1 @@
-2.16.1
+2.16.2

Modified: trunk/dirinstall/package/yast2-dirinstall.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinstall.changes?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/package/yast2-dirinstall.changes (original)
+++ trunk/dirinstall/package/yast2-dirinstall.changes Fri Apr 18 09:38:10 2008
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Apr 18 08:52:12 CEST 2008 - lslezak@xxxxxxx
+
+- do not create a copy of the installation source
+- select a product for installation - preselect dependent patterns
+- do not store the config when abort is pressed
+- code clean up (bnc#379154)
+- 2.16.2
+
+-------------------------------------------------------------------
 Fri Apr 11 13:55:26 CEST 2008 - jsrain@xxxxxxx
 
 - added possiblity to load software selection from AutoYaST profile

Modified: trunk/dirinstall/src/clients/dirinstall.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/dirinstall.ycp?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/src/clients/dirinstall.ycp (original)
+++ trunk/dirinstall/src/clients/dirinstall.ycp Fri Apr 18 09:38:10 2008
@@ -12,6 +12,7 @@
     textdomain "dirinstall";
 
     import "CommandLine";
+    import "PackageCallbacks";
 
 symbol StartDirInstall()
 {
@@ -23,13 +24,13 @@
 
     import "DirInstall";
     import "PackageLock";
-    import "Product";
     import "Report";
     import "Progress";
-    import "Popup";
 
     include "dirinstall/ui.ycp";
 
+    DirInstall::SetStarted(false);
+
     // check whether having the packager for ourselves
     if (! PackageLock::Check ())
        return `abort;
@@ -61,10 +62,6 @@
            stages, stages2, _("Please wait..."));
 
 
-    // install package callbacks
-    import "PackageCallbacksInit";
-    PackageCallbacksInit::InitPackageCallbacks();
-
     Progress::NextStage();
 
     // initializa the package manager
@@ -74,92 +71,48 @@
 
     Pkg::TargetFinish ();
     Pkg::SourceStartManager(true);
-    boolean have_patterns
-       = size (Pkg::ResolvableProperties ("", `pattern, "")) > 0;
-    boolean have_selections
-       = size (Pkg::GetSelections (`available, "base")) > 0;
-    have_patterns = have_patterns && ! have_selections;
 
     Progress::NextStage();
 
-    if (have_patterns)
-    {
-       y2milestone ("Host system is using patterns");
+    list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, 
"");
+    y2milestone("Found products: %1", prods);
 
-       Pkg::TargetInit ("/", false);
-       list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, 
"");
-       list<map<string,any> > base_l = filter (map<string,any> p, prods, {
-           return p["category"]:"" == "base";
-       });
-        map<string,any> base = base_l[0]:$[];
-       if (size (base_l) == 0)
-       {
-           y2warning ("No base product found, using first found product");
-           base = prods[0]:$[];
-       }
-       y2milestone ("Found base product: %1", base);
-       prods = Pkg::ResolvableProperties (base["name"]:"", `product, "");
-       y2milestone ("Found appropriate base products in repositories: %1", 
prods);
-       if (size (prods) == 0)
-       {
-           // error report
-           Report::Error (_("Could not read package information."));
-           Wizard::CloseDialog();
-           return `abort;
-       }
-       map<string,any> prod = prods[0]:$[];
-       integer source = prod["source"]:-1;
-       map src_data = Pkg::SourceGeneralData (source);
-       y2milestone ("Repository: %1", src_data);
-       Pkg::SourceSetEnabled (source, false);
-       string url = src_data["url"]:"";
-       string dir = src_data["product_dir"]:"/";
-       if (substring (url, 0, 3) == "cd:" || substring (url, 0, 4) == "dvd:")
-       {
-           if (! Popup::ContinueCancel (sformat (_("Insert %1 CD 1"), 
base["summary"]:"")))
-           {
-               Wizard::CloseDialog();
-               return `back;
-           }
-       }
-       new_src = Pkg::SourceCreateBase (url, dir);
-       old_src = source;
-       using_patterns = true;
-
-       string content_file = Pkg::SourceProvideFile (new_src, 1, "/content");
-       SCR::RegisterAgent (.media.content, `ag_ini(
-           `IniAgent( content_file,
-           $[
-               "options" : [ "read_only", "global_values", "flat" ],
-               "comments" : [ "^#.*", "^[ \t]*$", ],
-               "params" : [
-                   $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", 
"%s %s" ] ]
-               ]
-           ]
-       )));
-       any tmp1 = SCR::Read (.media.content.PATTERNS);
-       if (tmp1 != nil)
-           Product::patterns = splitstring ((string)tmp1, " ");
-       y2milestone ("***Patterns: %1", Product::patterns);
-       Pkg::TargetFinish ();
+    list<map<string,any> > base_l = filter (map<string,any> p, prods, {
+       return p["category"]:"" == "base";
+    });
+
+    map<string,any> base = base_l[0]:$[];
+    if (size (base_l) == 0)
+    {
+       y2warning ("No base product found, using first found product");
+       base = prods[0]:$[];
     }
-    else
+
+    y2milestone ("Found base product: %1", base);
+    prods = Pkg::ResolvableProperties (base["name"]:"", `product, "");
+    y2milestone ("Found appropriate base products in repositories: %1", prods);
+    if (size (prods) == 0)
     {
-       y2milestone ("Host system is using selections");
+       // error report
+       Report::Error (_("Could not read package information."));
+       Wizard::CloseDialog();
+       return `abort;
     }
 
+    // select the base product for installation
+    Pkg::ResolvableInstall(base["name"]:"", `product);
+
     symbol ret = Run ();
 
     Progress::NextStage();
 
     y2milestone ("Sequence returned %1", ret);
     DirInstall::UmountFilesystems ();
-    if (using_patterns)
+
+    if (DirInstall::GetStarted())
     {
-       Pkg::SourceDelete (new_src);
-       Pkg::SourceSetEnabled (old_src, true);
+       DirInstall::FinishPackageManager ();
     }
-    DirInstall::FinishPackageManager ();
 
     Wizard::CloseDialog();
     return ret;

Modified: trunk/dirinstall/src/clients/inst_dirinstall.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/inst_dirinstall.ycp?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/src/clients/inst_dirinstall.ycp (original)
+++ trunk/dirinstall/src/clients/inst_dirinstall.ycp Fri Apr 18 09:38:10 2008
@@ -12,16 +12,11 @@
     textdomain "dirinstall";
 
     import "DirInstall";
-    import "Installation";
-    import "Directory";
-    import "Popup";
     import "SlideShow";
-    import "PackageInstallation";
-    import "PackageCallbacks";
-    import "Wizard";
-    import "Progress";
     import "String";
 
+    DirInstall::SetStarted(true);
+
     Pkg::TargetFinish ();
     DirInstall::MountFilesystems ();
 
@@ -34,28 +29,6 @@
     // initialize the slideshow
     SlideShow::InitPkgData(false);
 
-/*
-    if(Pkg::TargetInit (Installation::destdir,true) != true)
-    {
-       // continue-cancel popup
-        if(Popup::ContinueCancel(_("Initializing the target directory 
failed")) == false)
-        {
-            return `abort;
-        }
-    }
-*/
-
-    /*
-    boolean anyToDelete = Pkg::PkgAnyToDelete();
-    SlideShow::SetLanguage (UI::GetLanguage(true));
-    SlideShow::InitPkgData();
-    SlideShow::OpenSlideShowDialog();
-
-    Pkg::TargetLogfile (Installation::destdir + Directory::logdir + 
"/y2logRPM");
-    list commit_result = PackageInstallation::CommitPackages (0, 0);
-
-    SlideShow::CloseSlideShowDialog();
-    */
 
     return `next;
 }

Modified: trunk/dirinstall/src/include/ui.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/include/ui.ycp?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/src/include/ui.ycp (original)
+++ trunk/dirinstall/src/include/ui.ycp Fri Apr 18 09:38:10 2008
@@ -55,32 +55,36 @@
 
     symbol ret = ProductControl::Run();
 
-    // display a progress during exit
-    list<string> stages =
-    [
-       // progress bar item
-       _("Finish the Package Manager"),
-       // progress bar item
-       _("Clean Up"),
-    ];
-
-    list<string> stages2 =
-    [
-       // progress bar item
-       _("Finishing the Package Manager..."),
-       // progress bar item
-       _("Cleaning Up..."),
-    ];
-
-    // progres bar label
-    Progress::New (_("Finishing..."), " ", size(stages) - 1,
-           // progres bar label
-           stages, stages2, _("Please wait..."));
+    if (DirInstall::GetStarted())
+    {
+       // display a progress during exit
+       list<string> stages =
+       [
+           // progress bar item
+           _("Finish the Package Manager"),
+           // progress bar item
+           _("Clean Up"),
+       ];
+
+       list<string> stages2 =
+       [
+           // progress bar item
+           _("Finishing the Package Manager..."),
+           // progress bar item
+           _("Cleaning Up..."),
+       ];
+
+       // progres bar label
+       Progress::New (_("Finishing..."), " ", size(stages) - 1,
+               // progres bar label
+               stages, stages2, _("Please wait..."));
+
+       Progress::NextStage();
+
+       Pkg::SourceFinishAll ();
+       Pkg::TargetFinish();
+    }
 
-    Progress::NextStage();
-
-    Pkg::SourceFinishAll ();
-    Pkg::TargetFinish();
     Installation::destdir = "/";
 
     return ret;

Modified: trunk/dirinstall/src/modules/DirInstall.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/DirInstall.ycp?rev=46817&r1=46816&r2=46817&view=diff
==============================================================================
--- trunk/dirinstall/src/modules/DirInstall.ycp (original)
+++ trunk/dirinstall/src/modules/DirInstall.ycp Fri Apr 18 09:38:10 2008
@@ -29,6 +29,8 @@
 global string dirinstall_control_file =
         "/usr/share/YaST2/control/dirinstall.xml";
 
+boolean started = false;
+
 list<list<string> > filesystems = [
     ["/proc", "proc", "proc" ],
     ["/sys", "sysfs", "sysfs" ],
@@ -36,6 +38,18 @@
 
 list<string> mounted_fs = [];
 
+global void SetStarted(boolean status)
+{
+    started = status;
+    y2milestone("DirInstall started set to: %1", started);
+}
+
+global boolean GetStarted()
+{
+    y2milestone("DirInstall started: %1", started);
+    return started;
+}
+
 global integer GetTargetChangeTime()
 {
     return Installation::dirinstall_target_time;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx