Mailinglist Archive: opensuse-commit (1262 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Sun Sep 17 00:57:37 CEST 2006.

--------
--- yast2-bootloader/yast2-bootloader.changes	2006-09-13 20:39:47.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-09-15 19:01:35.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Sep 15 19:00:21 CEST 2006 - od@xxxxxxx
+
+- added caching of bootloader proposal patch by lslezak@xxxxxxx,
+  with some changed variable names and added comments (feature
+  #300709)
+- 2.13.76
+
+-------------------------------------------------------------------

Old:
----
  yast2-bootloader-2.13.75.tar.bz2

New:
----
  yast2-bootloader-2.13.76.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.vfWVcp/_old	2006-09-17 00:57:28.000000000 +0200
+++ /var/tmp/diff_new_pack.vfWVcp/_new	2006-09-17 00:57:28.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.75)
+# spec file for package yast2-bootloader (Version 2.13.76)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-bootloader
-Version:        2.13.75
+Version:        2.13.76
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.75.tar.bz2
+Source0:        yast2-bootloader-2.13.76.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
 PreReq:         /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
     Dan Meszaros
 
 %prep
-%setup -n yast2-bootloader-2.13.75
+%setup -n yast2-bootloader-2.13.76
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,11 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Fri Sep 15 2006 - od@xxxxxxx
+- added caching of bootloader proposal patch by lslezak@xxxxxxx,
+  with some changed variable names and added comments (feature
+  [#300709])
+- 2.13.76
 * Wed Sep 13 2006 - od@xxxxxxx
 - reverted last change (in SVN) to bootfloppy.ycp, so the final
   correction to include this change of aosthof again:

++++++ yast2-bootloader-2.13.75.tar.bz2 -> yast2-bootloader-2.13.76.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.75/VERSION new/yast2-bootloader-2.13.76/VERSION
--- old/yast2-bootloader-2.13.75/VERSION	2006-09-13 20:32:13.000000000 +0200
+++ new/yast2-bootloader-2.13.76/VERSION	2006-09-15 19:00:09.000000000 +0200
@@ -1 +1 @@
-2.13.75
+2.13.76
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.75/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.13.76/src/clients/bootloader_proposal.ycp
--- old/yast2-bootloader-2.13.75/src/clients/bootloader_proposal.ycp	2006-05-10 15:47:30.000000000 +0200
+++ new/yast2-bootloader-2.13.76/src/clients/bootloader_proposal.ycp	2006-09-15 18:56:23.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * Module:		bootloader_proposal.ycp
  *
- * $Id: bootloader_proposal.ycp 30817 2006-05-10 13:42:41Z jplack $
+ * $Id: bootloader_proposal.ycp 32910 2006-09-15 16:57:59Z odabrunz $
  *
  * Author:		Klaus Kaempf <kkaempf@xxxxxxx>
  *
@@ -15,6 +15,7 @@
     import "Arch";
     import "BootCommon";
     import "Bootloader";
+    import "Storage";
     import "Mode";
 
     include "bootloader/routines/wizards.ycp";
@@ -32,9 +33,31 @@
 	boolean force_reset      = param["force_reset"     ]:false;
 	boolean language_changed = param["language_changed"]:false;
 
+	// use the cache if possible
+	    // if not asked to recreate and we have a cached proposal and
+	if (!force_reset && Bootloader::cached_proposal != nil
+	    // has the configuration been changed?
+	    && Bootloader::cached_settings == Bootloader::Export()
+	    // has the partitioning been changed?
+	    // This is correct as long as the proposal is only dependent on the
+	    // settings in Storage. AFAICT all information relevant to a
+	    // proposal in yast2-bootloader comes from yast2-storage. Even the
+	    // information from perl-Bootloader only depends on the settings in
+	    // Storage or libstorage. So this should be OK. At this point all
+	    // changes relevant to the yast2-bootloader settings are made
+	    // through Storage, so the change time of Storage data should be
+	    // sufficient.
+	    && Bootloader::cached_settings_base_data_change_time == Storage::GetTargetChangeTime())
+	{
+	    y2milestone("Using cached proposal");
+	    return Bootloader::cached_proposal;
+	}
+
 	if (force_reset && !Mode::autoinst ())
 	{
 	    // force re-calculation of bootloader proposal
+	    // this deletes any internally cached values, a new proposal will
+	    // not be partially based on old data now any more
 	    y2milestone ("Recalculation of bootloader configuration forced");
 	    Bootloader::Reset ();
 	}
@@ -72,7 +95,7 @@
         }
 	if (! BootCommon::BootloaderInstallable ())
 	{
-	    return $[
+	    ret = $[
 		"warning_level" : `error,
 		// error in the proposal
 		"warning" : _("Because of the partitioning, the bootloader cannot be installed properly"),
@@ -113,6 +136,11 @@
 	        }
 	    }
 	}
+
+	// cache the values
+	Bootloader::cached_settings = Bootloader::Export();
+	Bootloader::cached_settings_base_data_change_time = Storage::GetTargetChangeTime();
+	Bootloader::cached_proposal = ret;
     }
     // This is a request to start some dialog and interact with the user to set
     // up the Bootloader setting. Called when the user presses the link to set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.75/src/modules/Bootloader.ycp new/yast2-bootloader-2.13.76/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.13.75/src/modules/Bootloader.ycp	2006-05-19 16:02:01.000000000 +0200
+++ new/yast2-bootloader-2.13.76/src/modules/Bootloader.ycp	2006-09-15 18:56:23.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@xxxxxxx>
  *
- * $Id: Bootloader.ycp 31060 2006-05-19 12:21:30Z jplack $
+ * $Id: Bootloader.ycp 32910 2006-09-15 16:57:59Z odabrunz $
  *
  */
 
@@ -67,6 +67,13 @@
       */
     global boolean proposed_cfg_changed = false;
 
+    /**
+     * Cache for the installation proposal
+     */
+    global map cached_proposal = nil;
+    global map cached_settings = $[];
+    global integer cached_settings_base_data_change_time = nil;
+
 // old vga value handling function
 
     /**


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

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