Mailinglist Archive: yast-commit (1072 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Thu Oct  2 13:46:34 2008
New Revision: 51789

URL: http://svn.opensuse.org/viewcvs/yast?rev=51789&view=rev
Log:
- Handling new tag in 'desktops' in control file:
  'do_not_deselect_patterns' - prevents deselecting patterns while
  such a desktop is selected (bnc #431251).
- New list of patterns selected by installation in Packages module
  to keep previously selected patterns selected (bnc #431251).
- 2.17.23


Modified:
    trunk/packager/VERSION
    trunk/packager/package/yast2-packager.changes
    trunk/packager/src/modules/DefaultDesktop.ycp
    trunk/packager/src/modules/Packages.ycp

Modified: trunk/packager/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=51789&r1=51788&r2=51789&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Thu Oct  2 13:46:34 2008
@@ -1 +1 @@
-2.17.22
+2.17.23

Modified: trunk/packager/package/yast2-packager.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=51789&r1=51788&r2=51789&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Thu Oct  2 13:46:34 2008
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Thu Oct  2 13:42:19 CEST 2008 - locilka@xxxxxxx
+
+- Handling new tag in 'desktops' in control file:
+  'do_not_deselect_patterns' - prevents deselecting patterns while
+  such a desktop is selected (bnc #431251).
+- New list of patterns selected by installation in Packages module
+  to keep previously selected patterns selected (bnc #431251).
+- 2.17.23
+
+-------------------------------------------------------------------
 Mon Sep 29 16:41:40 CEST 2008 - locilka@xxxxxxx
 
 - Always initialize Packages before SlideShowSetup (bnc #427935).

Modified: trunk/packager/src/modules/DefaultDesktop.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/DefaultDesktop.ycp?rev=51789&r1=51788&r2=51789&view=diff
==============================================================================
--- trunk/packager/src/modules/DefaultDesktop.ycp (original)
+++ trunk/packager/src/modules/DefaultDesktop.ycp Thu Oct  2 13:46:34 2008
@@ -104,6 +104,12 @@
                one_desktop["description"] = ProductControl::GetTranslatedText 
((string) one_desktop_cf["description_id"]:"");
            }
 
+           // bnc #431251
+           // If this desktop is selected, do not deselect patterns
+           if (haskey (one_desktop_cf, "do_not_deselect_patterns")) {
+               one_desktop["do_not_deselect_patterns"] = (boolean) 
one_desktop_cf["do_not_deselect_patterns"]:false;
+           }
+
            all_desktops[desktop_name] = one_desktop;
        });
     }
@@ -237,16 +243,22 @@
 
     list <string> patterns_to_deselect = [];
 
-    // go through all known system task definitions
-    foreach (string one_desktop, map desktop_descr, GetAllDesktopsMap(), {
-       // all patterns required by a system type
-       foreach (string one_pattern, desktop_descr["patterns"]:[], {
-           // if not required, add it to 'to deselect'
-           if (one_pattern != nil && ! contains (patterns_to_select, 
one_pattern)) {
-               patterns_to_deselect = add (patterns_to_deselect, one_pattern);
-           }
+    // bnc #431251
+    // A dummy desktop is selected, do not deselect already selected patterns
+    if (all_desktops[desktop, "do_not_deselect_patterns"]:false == true) {
+       y2milestone ("Desktop %1 has 'do_not_deselect_patterns' set", desktop);
+    } else {
+       // go through all known system task definitions
+       foreach (string one_desktop, map desktop_descr, GetAllDesktopsMap(), {
+           // all patterns required by a system type
+           foreach (string one_pattern, desktop_descr["patterns"]:[], {
+               // if not required, add it to 'to deselect'
+               if (one_pattern != nil && ! contains (patterns_to_select, 
one_pattern)) {
+                   patterns_to_deselect = add (patterns_to_deselect, 
one_pattern);
+               }
+           });
        });
-    });
+    }
 
     y2milestone ("Patterns to deselect '%1' -> %2", desktop, 
patterns_to_deselect);
 

Modified: trunk/packager/src/modules/Packages.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=51789&r1=51788&r2=51789&view=diff
==============================================================================
--- trunk/packager/src/modules/Packages.ycp (original)
+++ trunk/packager/src/modules/Packages.ycp Thu Oct  2 13:46:34 2008
@@ -73,6 +73,10 @@
 list<map> cached_proposal_selections = [];
 list<string> cached_proposal_languages = [];
 
+    // bnc #431251
+    // patterns required by another parts of the installation
+    global list <string> required_patterns = [];
+
     global boolean install_sources = false;    // Installing source packages ?
     global integer timestamp = 0;              // last time of getting the 
target map
 
@@ -829,6 +833,12 @@
                pattern_list = add (pattern_list, pat_name);
        });
     }
+
+    if (required_patterns != nil && required_patterns != []) {
+       y2milestone ("Patterns required by installation: %1", 
required_patterns);
+       pattern_list = (list <string>) merge (pattern_list, required_patterns);
+    }
+
     y2milestone ("System patterns: %1", pattern_list);
     return pattern_list;
 }

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