Hello community,
here is the log from the commit of package webyast-firstboot-ws for
openSUSE:Factory
checked in at Wed May 4 11:38:58 CEST 2011.
--------
--- webyast-firstboot-ws/webyast-firstboot-ws.changes 2010-08-23
14:51:28.000000000 +0200
+++
/mounts/work_src_done/STABLE/webyast-firstboot-ws/webyast-firstboot-ws.changes
2011-05-02 14:03:58.000000000 +0200
@@ -1,0 +2,12 @@
+Mon May 2 11:58:37 UTC 2011 - [email protected]
+
+- added software updates to basesystem setup
+- 0.2.3
+
+-------------------------------------------------------------------
+Tue Apr 12 13:04:05 UTC 2011 - [email protected]
+
+- new caching
+- 0.2.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-firstboot-ws.spec ++++++
--- /var/tmp/diff_new_pack.BGnkcu/_old 2011-05-04 11:38:04.000000000 +0200
+++ /var/tmp/diff_new_pack.BGnkcu/_new 2011-05-04 11:38:04.000000000 +0200
@@ -26,7 +26,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.1
+Version: 0.2.3
Release: 1
Summary: WebYaST - initial settings service
Source: www.tar.bz2
++++++ basesystem.yml ++++++
--- /var/tmp/diff_new_pack.BGnkcu/_old 2011-05-04 11:38:04.000000000 +0200
+++ /var/tmp/diff_new_pack.BGnkcu/_new 2011-05-04 11:38:04.000000000 +0200
@@ -2,9 +2,11 @@
# (the 'vendor' directory has higher priority).
steps:
# example values, value is controller in webclient
-# - controller: eulas
-# - controller: administrator
-# - controller: network
-# - controller: time
-# - controller: mail
-# - controller: registration
+# - controller: eulas
+# - controller: administrator
+# - controller: network
+# - controller: time
+# - controller: mail
+# - controller: registration
+# - controller: patch_updates
+
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/models/basesystem.rb
new/www/app/models/basesystem.rb
--- old/www/app/models/basesystem.rb 2010-08-18 09:32:32.000000000 +0200
+++ new/www/app/models/basesystem.rb 2011-05-02 13:39:50.000000000 +0200
@@ -46,38 +46,41 @@
#Gets instance of Basesystem with initialized steps queue and if basic
settings is done
def Basesystem.find
- base = Basesystem.new
- basesystem_conf = BASESYSTEM_CONF
- basesystem_conf = BASESYSTEM_CONF_VENDOR if File.exists?
BASESYSTEM_CONF_VENDOR
- config = YaST::ConfigFile.new(basesystem_conf)
- if File.exist?(config.path)
- begin
- base.steps = config["steps"] || []
- rescue Exception => e
- raise CorruptedFileException.new(config.path)
- end
- if File.exist?(FINISH_FILE)
- begin
- base.done = IO.read(FINISH_FILE)
- rescue Exception => e
- raise CorruptedFileException.new(FINISH_FILE)
- end
- base.done = FINISH_STR if base.done.blank? #backward compatibility,
when touch indicate finished bs
- if base.done == FINISH_STR
- base.finish = true
- end
- else
- if base.steps.empty? #empty step definition
- base.finish = true
+ YastCache.fetch(self) {
+ base = Basesystem.new
+ basesystem_conf = BASESYSTEM_CONF
+ basesystem_conf = BASESYSTEM_CONF_VENDOR if File.exists?
BASESYSTEM_CONF_VENDOR
+ Rails.logger.info "Reading config file: #{basesystem_conf}"
+ config = YaST::ConfigFile.new(basesystem_conf)
+ if File.exist?(config.path)
+ begin
+ base.steps = config["steps"] || []
+ rescue Exception => e
+ raise CorruptedFileException.new(config.path)
+ end
+ if File.exist?(FINISH_FILE)
+ begin
+ base.done = IO.read(FINISH_FILE)
+ rescue Exception => e
+ raise CorruptedFileException.new(FINISH_FILE)
+ end
+ base.done = FINISH_STR if base.done.blank? #backward compatibility,
when touch indicate finished bs
+ if base.done == FINISH_STR
+ base.finish = true
+ end
else
- base.done = base.steps.first["controller"]
+ if base.steps.empty? #empty step definition
+ base.finish = true
+ else
+ base.done = base.steps.first["controller"]
+ end
end
+ else
+ base.steps = []
+ base.finish = true
end
- else
- base.steps = []
- base.finish = true
- end
- return base
+ base
+ }
end
#stores to system Basesystem settings
@@ -86,6 +89,7 @@
File.open(FINISH_FILE,"w") do |io|
io.write str
end
+ YastCache.reset(self)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/init.rb new/www/init.rb
--- old/www/init.rb 2009-10-15 13:37:13.000000000 +0200
+++ new/www/init.rb 2011-04-11 16:51:10.000000000 +0200
@@ -1 +1,5 @@
# Include hook code here
+# This plugin should be reloaded in development mode.
+if RAILS_ENV == "development"
+ ActiveSupport::Dependencies.load_once_paths.reject!{|x| x =~
/^#{Regexp.escape(File.dirname(__FILE__))}/}
+end
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
