May 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57316 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 26 May '09

26 May '09

Author: kmachalkova Date: Tue May 26 13:35:26 2009 New Revision: 57316 URL: http://svn.opensuse.org/viewcvs/yast?rev=57316&view=rev Log: Sort the partitions by start cylinder Handle two partitions end/start on the same cylinder Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue May 26 13:35:26 2009 @@ -296,9 +296,13 @@ integer ccyl = 0; integer endcyl = ddata["cyl_count"]:1; + list <map> partitions = (list <map> ) sort (map m, map n, ddata["partitions"]:[], { + return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] ); + }); + while(ccyl < endcyl) { - map part = ddata["partitions", i]:$[]; + map part = partitions[ i ]:$[]; // skip extended ones if ( part["type"]:`primary == `extended) { @@ -331,8 +335,12 @@ labels = add( labels, descr); // Now there is some xtra space between the end of this partition and the start of the next one - // or the end of the disk - if ( (Region::End( region) +1) != next_cyl ) + // or the end of the disk if + // 1. end +1th cyl is not the next one + // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder) + if ( (Region::End( region ) != next_cyl) && + ( (Region::End( region) + 1) != next_cyl ) + ) { integer tmp2 = 100*( next_cyl - Region::End(region))/ddata["cyl_count"]:1; bits = add( bits, (tmp2 < 1) ? 1 : tmp2); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57315 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn.opensuse.org 26 May '09

26 May '09

Author: coolo Date: Tue May 26 09:59:02 2009 New Revision: 57315 URL: http://svn.opensuse.org/viewcvs/yast?rev=57315&view=rev Log: new milestone, new desktops :) Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue May 26 09:59:02 2009 @@ -391,13 +391,13 @@ GNOME desktop description - It hould not be wider than 75 characters but it can take more lines then the original one. --> - <description_gnome><label>GNOME 2.26 is the latest desktop from the GNOME Project. + <description_gnome><label>GNOME 2.28 is the latest desktop from the GNOME Project. It combines stability and maturity with incremental innovations.</label></description_gnome>  - <description_kde><label>KDE 4.2 is the latest stable desktop released by the KDE Project. + <description_kde><label>KDE 4.3 is the latest stable desktop released by the KDE Project. It delivers an innovative, highly integrated desktop environment with a modern look and feel.</label></description_kde> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57314 - in /trunk/devtools: devtools/skeletons/rest-plugin/ devtools/skeletons/rest-plugin/app/ devtools/skeletons/rest-plugin/app/controllers/ devtools/skeletons/rest-plugin/app/models/ devtools/...
by lslezak＠svn.opensuse.org 25 May '09

25 May '09

Author: lslezak Date: Mon May 25 17:34:26 2009 New Revision: 57314 URL: http://svn.opensuse.org/viewcvs/yast?rev=57314&view=rev Log: - added new skeleton 'rest-plugin' for webservice plugins, initial version Added: trunk/devtools/devtools/skeletons/rest-plugin/ trunk/devtools/devtools/skeletons/rest-plugin/MIT-LICENSE trunk/devtools/devtools/skeletons/rest-plugin/README trunk/devtools/devtools/skeletons/rest-plugin/Rakefile trunk/devtools/devtools/skeletons/rest-plugin/app/ trunk/devtools/devtools/skeletons/rest-plugin/app/controllers/ trunk/devtools/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb trunk/devtools/devtools/skeletons/rest-plugin/app/models/ trunk/devtools/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb trunk/devtools/devtools/skeletons/rest-plugin/config/ trunk/devtools/devtools/skeletons/rest-plugin/config/resources/ trunk/devtools/devtools/skeletons/rest-plugin/config/resources/XXpkgXX.yml trunk/devtools/devtools/skeletons/rest-plugin/init.rb trunk/devtools/devtools/skeletons/rest-plugin/install.rb trunk/devtools/devtools/skeletons/rest-plugin/package/ trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.changes trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.spec trunk/devtools/devtools/skeletons/rest-plugin/rakelib/ trunk/devtools/devtools/skeletons/rest-plugin/rakelib/XXpkgXX_tasks.rake trunk/devtools/devtools/skeletons/rest-plugin/rakelib/include.rake trunk/devtools/devtools/skeletons/rest-plugin/test/ trunk/devtools/devtools/skeletons/rest-plugin/test/XXpkgXX_test.rb trunk/devtools/devtools/skeletons/rest-plugin/test/test_helper.rb trunk/devtools/devtools/skeletons/rest-plugin/uninstall.rb Modified: trunk/devtools/package/yast2-devtools.changes Added: trunk/devtools/devtools/skeletons/rest-plugin/MIT-LICENSE URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/MIT-LICENSE (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/MIT-LICENSE Mon May 25 17:34:26 2009 @@ -0,0 +1,20 @@ +Copyright (c) 2009 Novell + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Added: trunk/devtools/devtools/skeletons/rest-plugin/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/README (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/README Mon May 25 17:34:26 2009 @@ -0,0 +1,13 @@ +XXPkgXX +=========== + +REST API for XXPkgXX Yast module. + + +Example +======= + +Get list of all items: +http://localhost:8080/XXpkgXX.xml + +Copyright (c) 2009 Novell, released under the MIT license Added: trunk/devtools/devtools/skeletons/rest-plugin/Rakefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/Rakefile (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/Rakefile Mon May 25 17:34:26 2009 @@ -0,0 +1,33 @@ +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' +require 'rake/packagetask' + +desc 'Default: run unit tests.' +task :default => :test + +desc 'Test the XXPkgXX plugin.' +Rake::TestTask.new(:test) do |t| + t.libs << 'lib' + t.libs << 'test' + t.pattern = 'test/**/*_test.rb' + t.verbose = true +end + +desc 'Generate documentation for the XXPkgXX plugin.' +Rake::RDocTask.new(:rdoc) do |rdoc| + rdoc.rdoc_dir = 'rdoc' + rdoc.title = 'XXPkgXX' + rdoc.options << '--line-numbers' << '--inline-source' + rdoc.rdoc_files.include('README') + rdoc.rdoc_files.include('lib/**/*.rb') +end + +desc 'Generate tarball package' +Rake::PackageTask.new('www', :noversion) do |p| + p.need_tar_bz2 = true + p.package_dir = 'package' + p.package_files.include('**/*') + p.package_files.exclude('package') +end + Added: trunk/devtools/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/app/controllers/XXpkgXX_controller.rb Mon May 25 17:34:26 2009 @@ -0,0 +1,139 @@ + +require "XXpkgXX" + +class XXPkgXXController < ApplicationController + + # the user must be logged in + before_filter :login_required + + # GET /XXpkgXX + # GET /XXpkgXX.xml + # GET /XXpkgXX.json + def index + # read all items + # FIXME: use the correct permission ID according to XXPkgXX::find_all function +# if !permission_check("org.opensuse.yast.modules.yapi.XXpkgXX.list") +# render ErrorResult.error(403, 1, "no permission") and return +# end +# FIXME: ^^^^ uncomment this block!! + + @items = XXPkgXX.find_all + + respond_to do |format| + format.html { render :xml => @items, :location => "none" } #return xml only + format.xml { render :xml => @items, :location => "none" } + format.json { render :json => @items.to_json, :location => "none" } + end + end + + # GET /XXpkgXX/id + # GET /XXpkgXX/id.xml + # GET /XXpkgXX/id.json + # return properties of one item + def show + # FIXME: use the correct permission ID according to XXPkgXX::find function +# if !permission_check("org.opensuse.yast.modules.yapi.XXpkgXX.get") +# render ErrorResult.error(403, 1, "no permission") and return +# end +# FIXME: ^^^^ uncomment this block!! + + @item = XXPkgXX.new + @item.name = params[:id] + + if !(a)item.find + render ErrorResult.error(404, 2, "item not found") and return + end + + respond_to do |format| + format.html { render :xml => @item, :location => "none" } #return xml only + format.xml { render :xml => @item, :location => "none" } + format.json { render :json => @item.to_json, :location => "none" } + end + end + + # POST /XXpkgXX + # POST /XXpkgXX.xml + # POST /XXpkgXX.json + # create a new item + def create + @item = XXPkgXX.new + + # FIXME: use the correct permission ID according to XXPkgXX::add function + if !permission_check("org.opensuse.yast.modules.yapi.XXpkgXX.add") + render ErrorResult.error(403, 1, "no permission") and return + else + if !@item.update_attributes(params[:id]) + render ErrorResult.error(404, 2, "input error") and return + end + + if !(a)item.name.blank? + if !(a)item.add + render ErrorResult.error(404, 3, "adding share failed") and return + end + else + render ErrorResult.error(404, 4, "empty share name") and return + end + end + + respond_to do |format| + format.html { render :xml => @item, :location => "none" } #return xml only + format.xml { render :xml => @item, :location => "none" } + format.json { render :json => @item.to_json, :location => "none" } + end + end + + # PUT /XXpkgXX/id + # PUT /XXpkgXX/id.xml + # PUT /XXpkgXX/id.json + # update one item + def update + # FIXME: use the correct permission ID according to XXPkgXX::edit function + if !permission_check("org.opensuse.yast.modules.yapi.XXpkgXX.edit") + render ErrorResult.error(403, 1, "no permission") and return + end + + @item = XXPkgXX.find(params[:id][:name]) + + render ErrorResult.error(403, 1, "share not found") and return if @item.properties.blank? + + if !@item.update_attributes(params[:id]) + render ErrorResult.error(404, 2, "input error") and return + end + + if !(a)item.edit + render ErrorResult.error(404, 3, "editing share failed") and return + end + + respond_to do |format| + format.html { render :xml => @item, :location => "none" } #return xml only + format.xml { render :xml => @item, :location => "none" } + format.json { render :json => @item.to_json, :location => "none" } + end + end + + # DELETE /XXpkgXX/id + # DELETE /XXpkgXX/id.xml + # DELETE /XXpkgXX/id.json + # delete one item + def destroy + # FIXME: use the correct permission ID according to XXPkgXX::delete function + if !permission_check("org.opensuse.yast.modules.yapi.XXpkgXX.delete") + render ErrorResult.error(403, 1, "no permission") and return + end + + @item = XXPkgXX.new + @item.name = params[:id] + + if !(a)item.delete + render ErrorResult.error(404, 2, "delete failed") and return + end + + respond_to do |format| + format.html { render :xml => @item, :location => "none" } #return xml only + format.xml { render :xml => @item, :location => "none" } + format.json { render :json => @item.to_json, :location => "none" } + end + end + +end + Added: trunk/devtools/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/app/models/XXpkgXX.rb Mon May 25 17:34:26 2009 @@ -0,0 +1,147 @@ + +# import YastService class +require "yast_service" + +# models XXPkgXX objects +class XXPkgXX + + # FIXME: adapt to your model, add members to store all needed properties + attr_accessor :name, + :parameters + + def initialize + # unique identification (name, ID number, ...) + @name = nil + + # attributes + # FIXME: adapt to your model, add as many members as needed... + # initialize them to a default or empty values + @parameters = nil + end + + def XXPkgXX.find_all() + # read IDs of all existing items + + # FIXME: Use the correct Yast function call, e.g. + # items = YastService.Call("YaPI::XXPkgXX::List") + + items = [ "first", "second", "last" ] # FIXME: remove this dummy line + + # FIXME optionaly sort the result + items.sort! + + result = [ ] + + # convert the list of items to list of objects + items.each { |p| + item = XXPkgXX.new + + # set only ID, the other parameters should have default or empty values + item.name = p + + result << item + } + + return result + end + + def find + # cannot find invalid object + return false if @name.blank? + + # get properties of the object + + # FIXME: Use the correct Yast function call, e.g. + # properties = YastService.Call("YaPI::XXPkgXX::Get", @name) + + properties = { :p1 => "foo", :p2 => "bar" } # FIXME: remove this dummy line + + # check the value + if properties.nil? || properties == {} + @parameters = nil + return false + else + # FIXME update all class members + @parameters = properties + return true + end + end + + def update_attributes(attribs) + if attribs.has_key?(:name) + new_name = attribs[:name] + + # FIXME: valide the option + if new_name.class != :String + return false + end + + @name = new_name + end + + if attribs.has_key?(:parameters) + new_params = attribs[:parameters] + + # FIXME: valide the option + if new_params.class != :Hash + return false + end + + @parameters = new_params + end + + # FIXME: update all properties here... + + return true + end + + def add + # FIXME: Use the correct Yast function call, e.g. + # return YastService.Call("YaPI::XXPkgXX::Add", @name, @parameters) if !(a)name.blank? + + return false + end + + def edit + # FIXME: Use the correct Yast function call, e.g. + # return YastService.Call("YaPI::XXPkgXX::Edit", @name, @parameters) if !(a)name.blank? + + return false + end + + def delete + # FIXME: Use the correct Yast function call, e.g. + # return YastService.Call("YaPI::XXPkgXX::Delete", @name) if !(a)name.blank? + + return false + end + + # FIXME: export all members in XML + def to_xml( options = {} ) + return nil if @name.nil? + + xml = options[:builder] ||= Builder::XmlMarkup.new(options) + xml.instruct! unless options[:skip_instruct] + + xml.XXpkgXX do + xml.tag!(:name, @name) + + if !(a)parameters.blank? + # FIXME: Note: the first parameter of tag! is tag name, the second is value, + # the result is <parameters>[value of @parameter]</parameters> + # see http://api.rubyonrails.org/classes/Builder/XmlMarkup.html + xml.tag!(:parameters, @parameters) + end + end + end + + # export the object in JSON format + # reuse the XML builder functionality + def to_json( options = {} ) + hash = Hash.from_xml(to_xml()) + return hash.to_json + end + +end + +# vim: ft=ruby Added: trunk/devtools/devtools/skeletons/rest-plugin/config/resources/XXpkgXX.yml URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/config/resources/XXpkgXX.yml (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/config/resources/XXpkgXX.yml Mon May 25 17:34:26 2009 @@ -0,0 +1,2 @@ +interface: org.opensuse.yast.system.XXpkgXX +controller: XXpkgXX Added: trunk/devtools/devtools/skeletons/rest-plugin/init.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/init.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/init.rb Mon May 25 17:34:26 2009 @@ -0,0 +1 @@ +# Include hook code here Added: trunk/devtools/devtools/skeletons/rest-plugin/install.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/install.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/install.rb Mon May 25 17:34:26 2009 @@ -0,0 +1 @@ +# Install hook code here Added: trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.changes (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.changes Mon May 25 17:34:26 2009 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +XXdateXX - XXemailXX + +- initial version Added: trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.spec (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/package/yast2-webservice-XXpkgXX.spec Mon May 25 17:34:26 2009 @@ -0,0 +1,67 @@ +# +# spec file for package yast2-webservice-XXpkgXX +# +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define pkg_user yastws +%define plugin_name XXpkgXX + +Name: yast2-webservice-XXpkgXX +PreReq: yast2-webservice +Provides: yast2-webservice:/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app/controllers/XXpkgXX_controller.rb +License: MIT +Group: Productivity/Networking/Web/Utilities +Autoreqprov: on +Version: 0.0.1 +Release: 0 +Summary: YaST2 - Webservice - REST API for XXPkgXX Yast module +Source: www.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + + + +%description +YaST2 - Webservice - REST based interface for YaST XXPkgXX module. +Authors: +-------- + XXmaintainerXX <XXemailXX> + +%prep +%setup -q -n www + +%build + +%install + +# +# Install all web and frontend parts. +# +mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} +cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%dir /srv/www/%{pkg_user} +%dir /srv/www/%{pkg_user}/vendor +%dir /srv/www/%{pkg_user}/vendor/plugins +%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/MIT-LICENSE +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/README +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/Rakefile +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/init.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/install.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks +/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test + Added: trunk/devtools/devtools/skeletons/rest-plugin/rakelib/XXpkgXX_tasks.rake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/rakelib/XXpkgXX_tasks.rake (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/rakelib/XXpkgXX_tasks.rake Mon May 25 17:34:26 2009 @@ -0,0 +1,4 @@ +# desc "Explaining what the task does" +# task :XXpkgXX do +# # Task goes here +# end Added: trunk/devtools/devtools/skeletons/rest-plugin/rakelib/include.rake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/rakelib/include.rake (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/rakelib/include.rake Mon May 25 17:34:26 2009 @@ -0,0 +1,10 @@ + +# import global .rake files for plugins +if File.exist? "#{File.dirname(__FILE__)}/../../../webservice/lib/tasks/webservice/" + # use delopemnt files if we are in git repository + Dir["#{File.dirname(__FILE__)}/../../../webservice/lib/tasks/webservice/*.rake"].each { |ext| load ext } +else + # use the files from yast2-webservice package + Dir["/srv/www/yastws/lib/tasks/webservice/*.rake"].each { |ext| load ext } +end + Added: trunk/devtools/devtools/skeletons/rest-plugin/test/XXpkgXX_test.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/test/XXpkgXX_test.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/test/XXpkgXX_test.rb Mon May 25 17:34:26 2009 @@ -0,0 +1,8 @@ +require 'test_helper' + +class XXPkgXXTest < ActiveSupport::TestCase + # Replace this with your real tests. + test "the truth" do + assert true + end +end Added: trunk/devtools/devtools/skeletons/rest-plugin/test/test_helper.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/test/test_helper.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/test/test_helper.rb Mon May 25 17:34:26 2009 @@ -0,0 +1,3 @@ +require 'rubygems' +require 'active_support' +require 'active_support/test_case' \ No newline at end of file Added: trunk/devtools/devtools/skeletons/rest-plugin/uninstall.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/rest… ============================================================================== --- trunk/devtools/devtools/skeletons/rest-plugin/uninstall.rb (added) +++ trunk/devtools/devtools/skeletons/rest-plugin/uninstall.rb Mon May 25 17:34:26 2009 @@ -0,0 +1 @@ +# Uninstall hook code here Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Mon May 25 17:34:26 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 25 17:32:05 CEST 2009 - lslezak(a)suse.cz + +- added new skeleton 'rest-plugin' for webservice plugins, + initial version + +------------------------------------------------------------------- Wed May 20 17:23:49 CEST 2009 - lslezak(a)suse.cz - create-new-package - fixed syntax error (missing semicolon) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57313 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 25 May '09

25 May '09

Author: kmachalkova Date: Mon May 25 17:07:13 2009 New Revision: 57313 URL: http://svn.opensuse.org/viewcvs/yast?rev=57313&view=rev Log: Make visualization of partitions a bit smarter - show unpartitioned spaces as well Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon May 25 17:07:13 2009 @@ -281,20 +281,68 @@ { list <integer> bits = []; list <string> labels = []; + string emptyspace = _("Unpartitioned Space"); - foreach (map part, ddata["partitions"]:[], { - if (part["type"]:`primary != `extended) + // Clean disk + if (isempty(ddata["partitions"]:[])) + { + bits = [100]; + labels = [ emptyspace + "\n" + Storage::KByteToHumanString(ddata["size_k"]:0)]; + } + else + { + integer i = 0; + integer part_count = size(ddata["partitions"]:[]); + integer ccyl = 0; + integer endcyl = ddata["cyl_count"]:1; + + while(ccyl < endcyl) { - list <integer> region = part["region"]:[]; + map part = ddata["partitions", i]:$[]; + // skip extended ones + if ( part["type"]:`primary == `extended) + { + i = i+1; + continue; + } + + list <integer> region = ddata["partitions", i, "region"]:[]; + ccyl = Region::Start( region ); + integer next_cyl = 0; + + // this is the last partition in a row, look at the last cylinder of the disk + if ( (i+1) == part_count) + { + next_cyl = endcyl; + } + // somewhere in the middle, look where the next partition starts + else + { + next_cyl = Region::Start( ddata["partitions", i+1, "region"]:[] ); + } + integer tmp = 100*Region::Length( region )/ddata["cyl_count"]:1; //in % - string descr = part["device"]:"" + "\n" + Storage::KByteToHumanStringOmitZeroes(part["size_k"]:0); + string descr = part["device"]:"" + "\n" + Storage::KByteToHumanString(part["size_k"]:0); + y2debug("this cyl: %1 text: %2 end cyl: %3 next cyl: %4", ccyl, descr, Region::End( region), next_cyl); // Guarantee some minimal share (1%) of total graph width to a segment // It prevents small partitions e.g. swaps from disappearing completely bits = add( bits, (tmp < 1) ? 1 : tmp ); labels = add( labels, descr); + + // Now there is some xtra space between the end of this partition and the start of the next one + // or the end of the disk + if ( (Region::End( region) +1) != next_cyl ) + { + integer tmp2 = 100*( next_cyl - Region::End(region))/ddata["cyl_count"]:1; + bits = add( bits, (tmp2 < 1) ? 1 : tmp2); + labels = add( labels, emptyspace + "\n" + Storage::ByteToHumanString( (next_cyl - Region::End(region)) * ddata["cyl_size"]:1)); + } + + ccyl = next_cyl; + i = i+1; } - }); + } partitions_bargraph = `BarGraph(`id(`bgraph), bits, labels); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57312 - /branches/SuSE-SLE-10-SP3-Branch/support/package/yast2-support.changes
by mzugec＠svn.opensuse.org 25 May '09

25 May '09

Author: mzugec Date: Mon May 25 16:50:53 2009 New Revision: 57312 URL: http://svn.opensuse.org/viewcvs/yast?rev=57312&view=rev Log: removed calls of not-implemented functions Modified: branches/SuSE-SLE-10-SP3-Branch/support/package/yast2-support.changes Modified: branches/SuSE-SLE-10-SP3-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/support/package/yast2-support.changes Mon May 25 16:50:53 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 25 16:50:20 CEST 2009 - mzugec(a)suse.de + +- removed calls of not-implemented functions + +------------------------------------------------------------------- Sun May 17 16:15:37 CEST 2009 - mzugec(a)suse.cz - YaST module for supportconfig (fate#303811) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57311 - in /branches/SuSE-SLE-10-SP3-Branch/support/src: complex.ycp support.desktop wizards.ycp
by mzugec＠svn.opensuse.org 25 May '09

25 May '09

Author: mzugec Date: Mon May 25 16:48:52 2009 New Revision: 57311 URL: http://svn.opensuse.org/viewcvs/yast?rev=57311&view=rev Log: removed calls of not-implemented functions Modified: branches/SuSE-SLE-10-SP3-Branch/support/src/complex.ycp branches/SuSE-SLE-10-SP3-Branch/support/src/support.desktop branches/SuSE-SLE-10-SP3-Branch/support/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/support/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/support/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/support/src/complex.ycp Mon May 25 16:48:52 2009 @@ -77,7 +77,7 @@ if (!Confirm::MustBeRoot()) return `abort; } y2milestone ("Using configuration file %1", file); - setenv ("SC_CONF", file); +// setenv ("SC_CONF", file); // ensure ~/.supportconfig does exist if (SCR::Read (.target.size, file) < 0) { Modified: branches/SuSE-SLE-10-SP3-Branch/support/src/support.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/support/src/support.desktop (original) +++ branches/SuSE-SLE-10-SP3-Branch/support/src/support.desktop Mon May 25 16:48:52 2009 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;X-SuSE-YaST-Support; +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;X-SuSE-YaST-Support; X-KDE-ModuleType=Library X-KDE-RootOnly=true Modified: branches/SuSE-SLE-10-SP3-Branch/support/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/support/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/support/src/wizards.ycp Mon May 25 16:48:52 2009 @@ -148,7 +148,7 @@ ]; Wizard::CreateDialog(); - Wizard::SetDesktopTitle("support"); +// Wizard::SetDesktopTitle("support"); any ret = Sequencer::Run(aliases, sequence); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57310 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootELILO.ycp src/modules/BootGRUB.ycp src/modules/BootLILO.ycp src/modules/Bootloader_API.pm src/routines/lilolike.ycp
by jreidinger＠svn.opensuse.org 25 May '09

25 May '09

Author: jreidinger Date: Mon May 25 16:24:53 2009 New Revision: 57310 URL: http://svn.opensuse.org/viewcvs/yast?rev=57310&view=rev Log: refactor update code Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/Bootloader_API.pm trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon May 25 16:24:53 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 25 16:23:55 CEST 2009 - jreidinger(a)suse.cz + +- refactor Update code (update between products) + +------------------------------------------------------------------- Wed May 20 14:20:57 CEST 2009 - juhliarik(a)suse.cz - fixed additional options for memory test section (bnc#396150) Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO… ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Mon May 25 16:24:53 2009 @@ -419,7 +419,7 @@ BootCommon::globals["timeout"] = "8"; BootCommon::globals["append"] = BootArch::DefaultKernelParams (""); - BootCommon::UpdateSections (true, CreateLinuxSection); + BootCommon::UpdateSections (); // FIXME EFI entry name } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Mon May 25 16:24:53 2009 @@ -706,7 +706,7 @@ BootCommon::SetDeviceMap (BootStorage::device_mapping); Read (true, true); - BootCommon::UpdateSections (true, CreateLinuxSection); + BootCommon::UpdateSections (); BootCommon::UpdateGlobals (); } Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.… ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Mon May 25 16:24:53 2009 @@ -214,7 +214,7 @@ BootCommon::SetDeviceMap (BootStorage::device_mapping); Read (true, true); - BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection); + BootCommon::UpdateSections (); BootCommon::UpdateGlobals (); BootCommon::loader_device = BootCommon::UpdateDevice (BootCommon::loader_device); Modified: trunk/bootloader/src/modules/Bootloader_API.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader_API.pm (original) +++ trunk/bootloader/src/modules/Bootloader_API.pm Mon May 25 16:24:53 2009 @@ -326,6 +326,15 @@ return $ret; } +BEGIN { $TYPEINFO{splitPath} = ["function", ["list","string"],"string"]; } +sub splitPath($) { + my ($pass) = @_; + my @ret = $lib_ref->SplitPath($pass); + + DumpLog(); + return @ret; +} + #MBR utilities BEGIN { $TYPEINFO{detectThinkpadMBR} = ["function", "boolean","string"]; } sub detectThinkpadMBR($) { Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Mon May 25 16:24:53 2009 @@ -673,13 +673,51 @@ } /** - * Update sections of bootloader menu + * Update in section old devices to new kernel format + * @param section section to modify + */ +void UpdateDeviceForSection(map<string,any> section){ + if (section["type"]:"" == "image" || section["type"]:"" == "xen") + { + //check if we update correct image and if update is needed + if (BootCommon::UpdateDevice(section["root"]:"nonexisted") + == BootStorage::RootPartitionDevice + && section["root"]:""!=(BootCommon::UpdateDevice(section["root"]:""))) + { + y2milestone ("Updating device of section %1", section["name"]:"name"); + section["root"]= BootCommon::UpdateDevice(section["root"]:""); + string resume + = BootCommon::getKernelParamFromLine ( + section["append"]:"", "resume"); + if (resume != "false") + { + y2milestone ("Updating resume device of section %1", section["name"]:"name"); + resume = BootCommon::UpdateDevice (resume); + section["append"] = BootCommon::setKernelParamToLine ( + section["append"]:"", "resume", BootStorage::Dev2MountByDev(resume)); + } + section["__modified"] = "1"; + } + } +} + +/** + * Update sections of bootloader menu (removes obsolete thinks and + * place for ugly hacks (but doesn't efect zypper dup)) * modifies internal structures - * @param replace boolean true if old sectinos shall be replaced - * @param create_linux_section a reference to a function to create linux - * section anew + * label update is done in perl-Bootloader during updating kernel + * Purpose is don't break anything, but expect that previous state is + * working */ -global void UpdateSections (boolean replace, +global void UpdateSections () +{ + foreach (map<string,any> section, BootCommon::sections,{ + //remap device names from hd* to sd* + UpdateDeviceForSection(section); + }); +} + +/*global void UpdateSections (boolean replace, map<string,any>(string) create_linux_section) { list<map<string,any> > out = BootCommon::sections; @@ -812,7 +850,6 @@ } else return s; - }); } @@ -932,7 +969,7 @@ return s; }); sections = out; -} +}*/ /** * Update global options of bootloader -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57309 - in /trunk/storage/libstorage: src/ testsuite/
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 16:01:19 2009 New Revision: 57309 URL: http://svn.opensuse.org/viewcvs/yast?rev=57309&view=rev Log: - rename env. vars Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/testsuite/format1.cc trunk/storage/libstorage/testsuite/fstab1.cc trunk/storage/libstorage/testsuite/lvm_create.cc trunk/storage/libstorage/testsuite/lvm_extend.cc trunk/storage/libstorage/testsuite/md_create.cc trunk/storage/libstorage/testsuite/partition1.cc trunk/storage/libstorage/testsuite/uuid1.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon May 25 16:01:19 2009 @@ -153,7 +153,7 @@ } if (testmode()) { - char * tenv = getenv( "YAST2_STORAGE_TDIR" ); + const char* tenv = getenv("LIBSTORAGE_TESTDIR"); if( tenv!=NULL && strlen(tenv)>0 ) { logdir = testdir = tenv; @@ -163,7 +163,7 @@ testdir = logdir; } } - y2mil("instsys:" << instsys() << " testdir:" << testdir); + y2mil("logdir:" << logdir << " testdir:" << testdir); detectObjects(); setCacheChanges( true ); dumpObjectList(); Modified: trunk/storage/libstorage/testsuite/format1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/for… ============================================================================== --- trunk/storage/libstorage/testsuite/format1.cc (original) +++ trunk/storage/libstorage/testsuite/format1.cc Mon May 25 16:01:19 2009 @@ -80,7 +80,7 @@ main () { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); system ("cp data/disk_hda tmp/disk_hda"); system ("rm -f tmp/volume_info"); Modified: trunk/storage/libstorage/testsuite/fstab1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/fst… ============================================================================== --- trunk/storage/libstorage/testsuite/fstab1.cc (original) +++ trunk/storage/libstorage/testsuite/fstab1.cc Mon May 25 16:01:19 2009 @@ -146,7 +146,7 @@ main () { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); system ("cp data/volume_info tmp"); system ("cp data/disk_hda tmp"); Modified: trunk/storage/libstorage/testsuite/lvm_create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/lvm… ============================================================================== --- trunk/storage/libstorage/testsuite/lvm_create.cc (original) +++ trunk/storage/libstorage/testsuite/lvm_create.cc Mon May 25 16:01:19 2009 @@ -114,7 +114,7 @@ int main( int argc_iv, char** argv_ppcv ) { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); system ("rm -rf tmp/*"); Modified: trunk/storage/libstorage/testsuite/lvm_extend.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/lvm… ============================================================================== --- trunk/storage/libstorage/testsuite/lvm_extend.cc (original) +++ trunk/storage/libstorage/testsuite/lvm_extend.cc Mon May 25 16:01:19 2009 @@ -64,7 +64,7 @@ int main( int argc_iv, char** argv_ppcv ) { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); system ("rm -rf tmp/*"); Modified: trunk/storage/libstorage/testsuite/md_create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/md_… ============================================================================== --- trunk/storage/libstorage/testsuite/md_create.cc (original) +++ trunk/storage/libstorage/testsuite/md_create.cc Mon May 25 16:01:19 2009 @@ -51,7 +51,7 @@ int main( int argc_iv, char** argv_ppcv ) { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); system ("rm -rf tmp/*"); Modified: trunk/storage/libstorage/testsuite/partition1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/par… ============================================================================== --- trunk/storage/libstorage/testsuite/partition1.cc (original) +++ trunk/storage/libstorage/testsuite/partition1.cc Mon May 25 16:01:19 2009 @@ -94,7 +94,7 @@ main () { system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); /* * Check that we can create 3 primary, 1 extended and 59 logical partitions Modified: trunk/storage/libstorage/testsuite/uuid1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/uui… ============================================================================== --- trunk/storage/libstorage/testsuite/uuid1.cc (original) +++ trunk/storage/libstorage/testsuite/uuid1.cc Mon May 25 16:01:19 2009 @@ -77,7 +77,7 @@ parse_command_line (argc, argv); system ("mkdir -p tmp"); - setenv ("YAST2_STORAGE_TDIR", "tmp", 1); + setenv("LIBSTORAGE_TESTDIR", "tmp", 1); if (testmode) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57308 - in /trunk/storage/libstorage/src: Lock.cc Storage.cc
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 15:50:52 2009 New Revision: 57308 URL: http://svn.opensuse.org/viewcvs/yast?rev=57308&view=rev Log: - rename env. vars Modified: trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Mon May 25 15:50:52 2009 @@ -30,7 +30,7 @@ Lock::Lock(bool readonly, bool disable) - : disabled(disable || getenv("YAST2_STORAGE_NO_LOCKING") != NULL), + : disabled(disable || getenv("LIBSTORAGE_NO_LOCKING") != NULL), fd(-1) { if (disabled) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon May 25 15:50:52 2009 @@ -367,7 +367,7 @@ addToList( new MdCo( this, file ) ); } } - else if (autodetect() && getenv("YAST2_STORAGE_NO_MD") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_MD") == NULL) { MdCo * v = new MdCo( this, true ); if( !v->isEmpty() ) @@ -387,7 +387,7 @@ addToList( new LoopCo( this, file ) ); } } - else if (autodetect() && getenv("YAST2_STORAGE_NO_LOOP") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_LOOP") == NULL) { LoopCo * v = new LoopCo( this, true, ppart ); if( !v->isEmpty() ) @@ -409,7 +409,7 @@ addToList( new NfsCo( this, file ) ); } } - else if (autodetect() && getenv("YAST2_STORAGE_NO_NFS") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_NFS") == NULL) { NfsCo * v = new NfsCo(this, fstab, mounts); if( !v->isEmpty() ) @@ -432,7 +432,7 @@ } globfree (&globbuf); } - else if (autodetect() && getenv("YAST2_STORAGE_NO_LVM") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_LVM") == NULL) { list<string> l; LvmVg::getVgs( l ); @@ -467,7 +467,7 @@ } globfree (&globbuf); } - else if (autodetect() && getenv("YAST2_STORAGE_NO_DMRAID") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_DMRAID") == NULL) { list<string> l; DmraidCo::getRaids(l); @@ -508,7 +508,7 @@ } globfree (&globbuf); } - else if (autodetect() && getenv("YAST2_STORAGE_NO_DMMULTIPATH") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_DMMULTIPATH") == NULL) { list<string> l; DmmultipathCo::getMultipaths(l); @@ -550,7 +550,7 @@ } globfree (&globbuf); } - else if (autodetect() && getenv("YAST2_STORAGE_NO_DM") == NULL) + else if (autodetect() && getenv("LIBSTORAGE_NO_DM") == NULL) { DmCo * v = new DmCo( this, true, ppart ); if( !v->isEmpty() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57307 - in /trunk/transfer: VERSION agent-tftp/src/TftpAgent.cc package/yast2-transfer.changes
by ug＠svn.opensuse.org 25 May '09

25 May '09

Author: ug Date: Mon May 25 15:30:55 2009 New Revision: 57307 URL: http://svn.opensuse.org/viewcvs/yast?rev=57307&view=rev Log: send ACK package for the last DATA package that was received via TFTP Modified: trunk/transfer/VERSION trunk/transfer/agent-tftp/src/TftpAgent.cc trunk/transfer/package/yast2-transfer.changes Modified: trunk/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/VERSION?rev=57307&r1=57… ============================================================================== --- trunk/transfer/VERSION (original) +++ trunk/transfer/VERSION Mon May 25 15:30:55 2009 @@ -1 +1 @@ -2.16.1 +2.18.0 Modified: trunk/transfer/agent-tftp/src/TftpAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/agent-tftp/src/TftpAgen… ============================================================================== --- trunk/transfer/agent-tftp/src/TftpAgent.cc (original) +++ trunk/transfer/agent-tftp/src/TftpAgent.cc Mon May 25 15:30:55 2009 @@ -158,7 +158,8 @@ cp += len; } else if (finished) { - break; +// dont break here, we need the ACK for the last package +// break; } } /* send packet */ @@ -175,6 +176,9 @@ len = -1; break; } + if( cmd_get && (opcode == 4) && finished ) + // ACK sent + break; /* receive packet */ memset(&from, 0, sizeof(from)); fromlen = sizeof(from); @@ -229,7 +233,7 @@ } } while (timeout && (len >= 0)); - if (len < 0) { + if (len < 0 || finished ) { break; } Modified: trunk/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/package/yast2-transfer.… ============================================================================== --- trunk/transfer/package/yast2-transfer.changes (original) +++ trunk/transfer/package/yast2-transfer.changes Mon May 25 15:30:55 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 25 15:29:01 CEST 2009 - ug(a)suse.de + +- send ACK package for the last DATA package that was received + via TFTP +- 2.18.0 + +------------------------------------------------------------------- Fri Jan 4 09:46:04 CET 2008 - ug(a)suse.de - follow HTTP code 301 and 302 (#344123) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57306 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/OneClickInstallCLI
by mvidner＠svn.opensuse.org 25 May '09

25 May '09

Author: mvidner Date: Mon May 25 14:57:45 2009 New Revision: 57306 URL: http://svn.opensuse.org/viewcvs/yast?rev=57306&view=rev Log: Added -h, --help to /sbin/OCICLI. Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallCLI Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Mon May 25 14:57:45 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 25 14:57:39 CEST 2009 - mvidner(a)suse.cz + +- Added -h, --help to /sbin/OCICLI. + +------------------------------------------------------------------- Thu Apr 2 13:57:51 CEST 2009 - lslezak(a)suse.cz - properly initialize package slideshow, display correct Modified: trunk/metapackage/src/OneClickInstallCLI URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallC… ============================================================================== --- trunk/metapackage/src/OneClickInstallCLI (original) +++ trunk/metapackage/src/OneClickInstallCLI Mon May 25 14:57:45 2009 @@ -1,5 +1,5 @@ #!/bin/sh -if [ $# -ne 1 ] +if [ $# -ne 1 -o "$1" = "-h" -o "$1" = "--help" ] then echo "Usage: <YMP URL>" exit 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57305 - in /trunk/storage/libstorage/src: Storage.cc Volume.cc
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 14:15:50 2009 New Revision: 57305 URL: http://svn.opensuse.org/viewcvs/yast?rev=57305&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon May 25 14:15:50 2009 @@ -5384,7 +5384,7 @@ if( !vol->isMounted() ) { removeDmTableTo( *vol ); - string mdir = tmpDir() + "/tmp_mp"; + string mdir = tmpDir() + "/tmp-free-mp"; unlink( mdir.c_str() ); rmdir( mdir.c_str() ); string save_opt; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon May 25 14:15:50 2009 @@ -1266,7 +1266,7 @@ string mpoint = orig_mp; if( !isMounted() ) { - mpoint = cont->getStorage()->tmpDir()+"/mp"; + mpoint = cont->getStorage()->tmpDir() + "/tmp-xfs-mp"; mkdir( mpoint.c_str(), 0700 ); ret = mount( mpoint ); needrmdir = true; @@ -1655,7 +1655,7 @@ static EncryptType try_order[] = { ENC_LUKS, ENC_TWOFISH_OLD, ENC_TWOFISH256_OLD, ENC_TWOFISH }; string fname = cont->getStorage()->tmpDir()+"/pwdf"; - string mpname = cont->getStorage()->tmpDir()+"/mp"; + string mpname = cont->getStorage()->tmpDir() + "/tmp-enc-mp"; SystemCmd c; y2mil("device:" << dev); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57304 - /trunk/storage/libstorage/src/EtcFstab.cc
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 12:44:10 2009 New Revision: 57304 URL: http://svn.opensuse.org/viewcvs/yast?rev=57304&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/EtcFstab.cc Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Mon May 25 12:44:10 2009 @@ -651,19 +651,21 @@ int EtcFstab::flush() { int ret = 0; - list<Entry>::iterator i = co.begin(); AsciiFile *fstab = NULL; AsciiFile *cryptotab = NULL; AsciiFile *cur = NULL; AsciiFile crypttab( prefix + "/crypttab", true ); - int lineno; - if( i!=co.end() && !checkDir( prefix ) ) + if (!co.empty() && !checkDir(prefix)) createPath( prefix ); + + list<Entry>::iterator i = co.begin(); while( i!=co.end() && ret==0 ) { switch( i->op ) { case Entry::REMOVE: + { + int lineno; cur = findFile( i->old, fstab, cryptotab, lineno ); if( lineno>=0 ) { @@ -675,8 +677,11 @@ else ret = FSTAB_REMOVE_ENTRY_NOT_FOUND; i = co.erase( i ); - break; + } break; + case Entry::UPDATE: + { + int lineno; cur = findFile( i->old, fstab, cryptotab, lineno ); if( lineno<0 ) cur = findFile( i->nnew, fstab, cryptotab, lineno ); @@ -723,9 +728,11 @@ } else ret = FSTAB_UPDATE_ENTRY_NOT_FOUND; - break; + } break; + case Entry::ADD: - { + { + int lineno; cur = findFile( i->nnew, fstab, cryptotab, lineno ); string line = createTabLine( i->nnew ); string before_dev; @@ -764,8 +771,8 @@ } i->old = i->nnew; i->op = Entry::NONE; - } - break; + } break; + default: break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57303 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 12:32:31 2009 New Revision: 57303 URL: http://svn.opensuse.org/viewcvs/yast?rev=57303&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon May 25 12:32:31 2009 @@ -3312,10 +3312,8 @@ int ret = 0; assertInit(); NfsCo co( this ); - string mdir = tmpDir() + "/tmp_mp"; - unlink( mdir.c_str() ); - rmdir( mdir.c_str() ); - createPath( mdir ); + string mdir = tmpDir() + "/tmp-nfs-mp"; + mkdir(mdir.c_str(), 0777); ret = co.addNfs( nfsDev, 0, "" ); if( !opts.empty() ) co.vBegin()->setFstabOption( opts ); @@ -3340,9 +3338,10 @@ sizeK = getDfSize( mdir ); ret = co.vBegin()->umount( mdir ); } + rmdir(mdir.c_str()); y2mil( "name:" << nfsDev << " opts:" << opts << " ret:" << ret << " sizeK:" << sizeK ); - return( ret ); + return ret; } int -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57302 - /trunk/storage/storage/src/include/ep-settings.ycp
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 11:55:45 2009 New Revision: 57302 URL: http://svn.opensuse.org/viewcvs/yast?rev=57302&view=rev Log: - check support status for filesystems Modified: trunk/storage/storage/src/include/ep-settings.ycp Modified: trunk/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-s… ============================================================================== --- trunk/storage/storage/src/include/ep-settings.ycp (original) +++ trunk/storage/storage/src/include/ep-settings.ycp Mon May 25 11:55:45 2009 @@ -12,6 +12,7 @@ void DestroySettingsPanel(any user_data); + list< map<symbol, any> > visible_fields = [ // list entry $[ `label : _("Label"), `fields : [ `label ] ], @@ -29,7 +30,7 @@ $[ `label : _("Fibre Channel information"), `fields : toset([ `fc_wwpn, `fc_fcp_lun, `fc_port_id ]) ] ]; - map <symbol, string> mount_bys = $[ + map<symbol, string> mount_bys = $[ // combo box entry `device : _("Device Name"), // combo box entry @@ -39,9 +40,10 @@ // combo box entry `id : _("Device ID"), // combo box entry - `path : _("Device Path") + `path : _("Device Path") ]; + void CreateSettingsPanel(any user_data) { list <term> PreselectVisibleFields() @@ -55,10 +57,19 @@ }); } - list <term> CBItems = maplist( symbol item_id, string label, mount_bys, { + list <term> mount_by_items = maplist( symbol item_id, string label, mount_bys, { return `item(`id(item_id), label); }); + list<symbol> filesystems = filter(symbol fs, [ `ext2, `ext3, `ext4, `reiser, `xfs ], { + return FileSystems::IsSupported(fs) && !FileSystems::IsUnsupported(fs); + }); + + list<term> filesystem_items = maplist(symbol fs, filesystems, { + return `item(`id(fs), FileSystems::GetName(fs, "Error")); + }); + + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -68,23 +79,12 @@ `Left(`ComboBoxSelected(`id(`default_mountby),`opt(`notify), // combo box label _("Default Mount by"), - CBItems, + mount_by_items, `id(Storage::GetDefaultMountBy()))), `Left(`ComboBoxSelected(`id(`default_fs),`opt(`notify), // combo box label _("Default File System"), - [ - // combo box entry - `item(`id(`ext2), "Ext2"), - // combo box entry - `item(`id(`ext3), "Ext3"), - // combo box entry - `item(`id(`ext4), "Ext4"), - // combo box entry - `item(`id(`reiser), "Reiser"), - // combo box entry - `item(`id(`xfs), "XFS") - ], + filesystem_items, `id(Partitions::DefaultFs()))), `VSpacing(1), `Left(`ComboBoxSelected(`id(`display_name), `opt(`notify), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57301 - /tags/stable-2_18_12/storage/
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 10:37:38 2009 New Revision: 57301 URL: http://svn.opensuse.org/viewcvs/yast?rev=57301&view=rev Log: Created tag stable-2_18_12 for storage Added: tags/stable-2_18_12/storage/ (props changed) - copied from r57300, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57300 - in /trunk/storage: VERSION package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 May '09

25 May '09

Author: aschnell Date: Mon May 25 10:20:26 2009 New Revision: 57300 URL: http://svn.opensuse.org/viewcvs/yast?rev=57300&view=rev Log: - bump version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=57300&r1=572… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon May 25 10:20:26 2009 @@ -1 +1 @@ -2.18.11 +2.18.12 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon May 25 10:20:26 2009 @@ -4,6 +4,7 @@ - disable adding kernel modules needed for accessing the root filesystem to INITRD_MODULES since mkinited is capable of detecting them on it's own +- 2.18.12 ------------------------------------------------------------------- Wed May 20 15:17:21 CEST 2009 - aschnell(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57299 - /tags/branch-SLE-10-SP3-2_13_13/repair/
by jreidinger＠svn.opensuse.org 25 May '09

25 May '09

Author: jreidinger Date: Mon May 25 09:29:51 2009 New Revision: 57299 URL: http://svn.opensuse.org/viewcvs/yast?rev=57299&view=rev Log: Created tag branch-SLE-10-SP3-2_13_13 for repair Added: tags/branch-SLE-10-SP3-2_13_13/repair/ - copied from r57298, branches/SuSE-SLE-10-SP3-Branch/repair/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57298 - in /branches/SuSE-SLE-10-SP3-Branch/repair: VERSION package/yast2-repair.changes src/bootloader_routines.ycp
by jreidinger＠svn.opensuse.org 25 May '09

25 May '09

Author: jreidinger Date: Mon May 25 09:29:26 2009 New Revision: 57298 URL: http://svn.opensuse.org/viewcvs/yast?rev=57298&view=rev Log: adapt repair to new version of yast2-bootloader Modified: branches/SuSE-SLE-10-SP3-Branch/repair/VERSION branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes branches/SuSE-SLE-10-SP3-Branch/repair/src/bootloader_routines.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/VERSION Mon May 25 09:29:26 2009 @@ -1 +1 @@ -2.13.12 +2.13.13 Modified: branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes Mon May 25 09:29:26 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 25 09:25:30 CEST 2009 - jreidinger(a)suse.cz + +- adapt to SP3 yast2-bootloader change +- 2.13.13 + +------------------------------------------------------------------- Thu Mar 12 08:35:24 CET 2009 - jsuchome(a)suse.cz - offer new lines in /etc/fstab with new device names (bnc#431418) Modified: branches/SuSE-SLE-10-SP3-Branch/repair/src/bootloader_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/src/bootloader_routines.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/src/bootloader_routines.ycp Mon May 25 09:29:26 2009 @@ -17,7 +17,7 @@ global define void readDeviceMap () { BootCommon::InitializeLibrary (true, "grub"); - BootCommon::ReadFiles (); + BootCommon::ReadFiles (false); device_map = BootCommon::GetDeviceMap (); y2debug ("device map: %1", device_map); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57297 - in /trunk/storage: package/yast2-storage.changes storage/src/storage_finish.ycp
by aschnell＠svn.opensuse.org 22 May '09

22 May '09

Author: aschnell Date: Fri May 22 13:55:13 2009 New Revision: 57297 URL: http://svn.opensuse.org/viewcvs/yast?rev=57297&view=rev Log: - disable adding kernel modules needed for accessing the root filesystem to INITRD_MODULES since mkinited is capable of detecting them on it's own Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/storage_finish.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri May 22 13:55:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 22 13:30:28 CEST 2009 - aschnell(a)suse.de + +- disable adding kernel modules needed for accessing the root + filesystem to INITRD_MODULES since mkinited is capable of + detecting them on it's own + +------------------------------------------------------------------- Wed May 20 15:17:21 CEST 2009 - aschnell(a)suse.de - removed usedByName from StorageInterface and "used_by" from Modified: trunk/storage/storage/src/storage_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/storage_fini… ============================================================================== --- trunk/storage/storage/src/storage_finish.ycp (original) +++ trunk/storage/storage/src/storage_finish.ycp Fri May 22 13:55:13 2009 @@ -49,10 +49,12 @@ } else if (func == "Write") { +/* list<string> storage_initrdm = (list<string>)Storage::GetRootInitrdModules(); foreach(string m, storage_initrdm, { Initrd::AddModule (m, ""); }); +*/ if( !Mode::update () ) { SCR::Execute (.target.mkdir, Installation::sourcedir); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57296 - /trunk/storage/libstorage/src/MdCo.cc
by aschnell＠svn.opensuse.org 22 May '09

22 May '09

Author: aschnell Date: Fri May 22 11:36:40 2009 New Revision: 57296 URL: http://svn.opensuse.org/viewcvs/yast?rev=57296&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/MdCo.cc Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Fri May 22 11:36:40 2009 @@ -563,12 +563,10 @@ if( val ) { string mdconf = tmpDir + "/mdadm.conf"; - string cmd = "echo 1 > /sys/module/md_mod/parameters/start_ro"; - c.execute( cmd ); - cmd = MDADMBIN " --examine --scan --config=partitions >" + mdconf; - c.execute( cmd ); - cmd = MDADMBIN " --assemble --scan --config=" + mdconf; - c.execute( cmd ); + c.execute("echo 1 > /sys/module/md_mod/parameters/start_ro"); + c.execute(MDADMBIN " --examine --scan --config=partitions > " + mdconf); + c.execute(MDADMBIN " --assemble --scan --config=" + mdconf); + unlink(mdconf.c_str()); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57295 - in /trunk/storage/libstorage/src: Storage.cc Storage.h Volume.cc
by aschnell＠svn.opensuse.org 22 May '09

22 May '09

Author: aschnell Date: Fri May 22 11:18:58 2009 New Revision: 57295 URL: http://svn.opensuse.org/viewcvs/yast?rev=57295&view=rev Log: - tmpdir cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri May 22 11:18:58 2009 @@ -116,7 +116,7 @@ Storage::initialize() { initialized = true; - char tbuf[32] = "/tmp/liby2storageXXXXXX"; + char tbuf[32] = "/tmp/libstorage-XXXXXX"; if( mkdtemp( tbuf )==NULL ) { y2err("tmpdir creation " << tbuf << " failed. Aborting..."); @@ -125,7 +125,6 @@ else { tempdir = tbuf; - rmdir( tempdir.c_str() ); } if( access( "/etc/sysconfig/storage", R_OK )==0 ) { @@ -273,15 +272,11 @@ logContainersAndVolumes(logdir); clearPointerList(cont); deleteBackups(); - if( !tempdir.empty() && access( tempdir.c_str(), R_OK )==0 ) - { - SystemCmd c( "rmdir " + tempdir ); - if( c.retcode()!=0 ) - { - y2err("stray tmpfile"); - c.execute( "ls -l" + tempdir ); - } - } + if (!tempdir.empty() && rmdir(tempdir.c_str()) != 0) + { + y2err("stray tmpfile"); + SystemCmd("ls -l " + quote(tempdir)); + } delete fstab; y2mil("destructed Storage"); } @@ -293,12 +288,6 @@ detectObjects(); } -const string& Storage::tmpDir() const - { - if( access( tempdir.c_str(), W_OK )!= 0 ) - mkdir( tempdir.c_str(), 0700 ); - return( tempdir ); - } void Storage::detectArch() @@ -5484,7 +5473,6 @@ { umountDevice( device ); rmdir( mp.c_str() ); - rmdir( tmpDir().c_str() ); } if( vol->needCrsetup() && vol->doCrsetup() ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Fri May 22 11:18:58 2009 @@ -222,7 +222,7 @@ const string& tDir() const { return( testdir ); } const string& root() const { return( rootprefix ); } string prependRoot(const string& mp) const; - const string& tmpDir() const; + const string& tmpDir() const { return tempdir; } bool efiBoot() const { return efiboot; } static const string& arch() { return( proc_arch ); } static bool isPPCMac() { return( is_ppc_mac ); } Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri May 22 11:18:58 2009 @@ -1291,7 +1291,6 @@ if( needrmdir ) { rmdir( mpoint.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); } } break; @@ -1749,7 +1748,6 @@ } unlink( fname.c_str() ); rmdir( mpname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); y2mil("ret:" << encTypeString(ret)); return( ret ); } @@ -1790,7 +1788,6 @@ if( !fname.empty() ) { unlink( fname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); } Storage::waitForDevice(loop_dev); } @@ -1913,7 +1910,6 @@ } } unlink( fname.c_str() ); - rmdir( cont->getStorage()->tmpDir().c_str() ); Storage::waitForDevice(dmcrypt_dev); } if( ret==0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57294 - in /trunk/yast2/library: cwm/doc/Makefile.am packages/src/PackageSystem.ycp runlevel/src/ag_initscripts
by mvidner＠svn.opensuse.org 22 May '09

22 May '09

Author: mvidner Date: Fri May 22 10:54:19 2009 New Revision: 57294 URL: http://svn.opensuse.org/viewcvs/yast?rev=57294&view=rev Log: OOPS, the previous commit (r57293) accidentally included unrelated changes. Reverted. Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.a… ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:54:19 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-xmlto.ami +include ${srcdir}/docbook-docbook-toys.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-*.ami +EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:54:19 2009 @@ -401,8 +401,6 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself - } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { - _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -421,7 +419,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); + return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_in… ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:54:19 2009 @@ -83,9 +83,6 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || -# Fedora - FILENAME == /functions/ || - FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57293 - in /trunk/yast2: library/cwm/doc/Makefile.am library/packages/src/PackageSystem.ycp library/runlevel/src/ag_initscripts package/yast2.changes scripts/yast2-completion.sh
by mvidner＠svn.opensuse.org 22 May '09

22 May '09

Author: mvidner Date: Fri May 22 10:49:24 2009 New Revision: 57293 URL: http://svn.opensuse.org/viewcvs/yast?rev=57293&view=rev Log: yast2-completion.sh: removed <(process substitution) so that it works even with POSIXLY_CORRECT=1 (bnc#504844). Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.a… ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:49:24 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-docbook-toys.ami +include ${srcdir}/docbook-xmlto.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami +EXTRA_DIST = $(html_DATA) docbook-*.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:49:24 2009 @@ -401,6 +401,8 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself + } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { + _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -419,7 +421,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); + return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_in… ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:49:24 2009 @@ -83,6 +83,9 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || +# Fedora + FILENAME == /functions/ || + FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 22 10:49:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 22 10:47:43 CEST 2009 - mvidner(a)suse.cz + +- yast2-completion.sh: removed <(process substitution) so that it + works even with POSIXLY_CORRECT=1 (bnc#504844). + +------------------------------------------------------------------- Wed May 20 12:45:47 CEST 2009 - aschnell(a)suse.de - moved .proc.mounts agent from yast2-installation to yast2 (bnc Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.s… ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Fri May 22 10:49:24 2009 @@ -42,18 +42,18 @@ if [[ -n $prevprev && $prevprev == $mod ]]; then # build option list # prev is a module option - while read line ; do + MODOPTS=(`LC_ALL=C $YAST $mod $prev help 2>&1 | while read line ; do case "$line" in Options:*) while read opt rest ; do case "$opt" in "") break 2 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod $prev help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do @@ -67,14 +67,14 @@ # previous option is a known yast module? if [[ $prev == $mod ]]; then # build option list - while read line ; do + MODOPTS=(` LC_ALL=C $YAST $mod help 2>&1 | while read line ; do case "$line" in Basic\ Syntax:*) while read rest rest opt rest ; do case "$opt" in \<*\>) ;; "") break ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; @@ -82,12 +82,12 @@ while read opt rest ; do case "$opt" in "") break 2 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57292 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: yqdesktopfilesmodel.cpp yqdesktopfilesmodel.h yqmodulegroupsmodel.cpp yqmodulegroupsmodel.h
by kmachalkova＠svn.opensuse.org 21 May '09

21 May '09

Author: kmachalkova Date: Thu May 21 17:16:34 2009 New Revision: 57292 URL: http://svn.opensuse.org/viewcvs/yast?rev=57292&view=rev Log: Added personal(izable) items into group view + render headlines in bold Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.cpp Thu May 21 17:16:34 2009 @@ -207,7 +207,6 @@ else qSort(d->desktop_files.begin(), d->desktop_files.end(), qGreater<QString>()); emit layoutChanged(); - qDebug() << "sorting" << endl; return; } @@ -281,11 +280,18 @@ } } -void YQDesktopFilesModel::addPropertyToDesktopFile( QString &fname, QString &key, QString &value) +void YQDesktopFilesModel::addPropertyToDesktopFile( QString &fname, const QString &key, QString &value) { if (d->cache.find( fname ) != d->cache.end()) { d->cache[ fname ].insert( key, value ); } + else + { + PropertyMap pm; + pm[key] = value; + + d->cache[ fname ] = pm; + } } #include "yqdesktopfilesmodel.moc" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqdesktopfilesmodel.h Thu May 21 17:16:34 2009 @@ -86,7 +86,7 @@ void addDesktopFile(QString &fname); void addDesktopFiles( QStringList &flist); - void addPropertyToDesktopFile( QString &fname, QString &key, QString &value ); + void addPropertyToDesktopFile( QString &fname, const QString &key, QString &value ); protected: void readDesktopFilesDirectories(); Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.cpp Thu May 21 17:16:34 2009 @@ -10,6 +10,8 @@ \---------------------------------------------------------------------*/ #include <QDebug> +#include <QFont> +#include <QFontMetrics> #include <QSettings> #include <QDir> #include <QIcon> @@ -33,6 +35,7 @@ addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); addIconPath("/usr/share/icons/hicolor/32x32/apps"); reindex(); + addPersonalStuff(); } YQModuleGroupsModel::~YQModuleGroupsModel() @@ -61,6 +64,31 @@ return skey; } +void YQModuleGroupsModel::addPersonalStuff() +{ + QList < QPair <QString, QString> > fake; + + fake << QPair<QString, QString> ( "Personal.desktop", "Personal") + << QPair<QString, QString> ( "Favourites.desktop", "Favourites") + << QPair<QString, QString> ( "Recent.desktop", "Recently Used") + << QPair<QString, QString> ( "Modules.desktop", "Modules"); + + QPair <QString, QString> p; + + foreach( p, fake ) + { + addDesktopFile( p.first ); + addPropertyToDesktopFile( p.first, "Name", p.second ); + addPropertyToDesktopFile( p.first, "X-SuSE-YaST-Group", p.second ); + } + + typeMap["Personal"] = Headline; + typeMap["Modules"] = Headline; + typeMap["Favourites"] = Special; + typeMap["Recently Used"] = Special; + +} + void YQModuleGroupsModel::reindex() { // pairs, because sort keys don't have to be unique :( @@ -78,17 +106,33 @@ d->desktop_files.clear(); QPair<int,QString> p; - foreach( p , sortKeys ) + foreach( p, sortKeys ) { d->desktop_files << p.second; } } - QVariant YQModuleGroupsModel::data( const QModelIndex &index, int role ) const { - return YQDesktopFilesModel::data(index, role); + if (role == Qt::FontRole ) + { + QString name = propertyValue( index, "Name" ).toString(); + QFont f; + + if( typeMap[name] == Headline) + { + f.setBold(true); + QFontMetrics fm(f); + f.setPixelSize( (int) (fm.height() * 1.05) ); + QVariant myData = QVariant(f); + return myData; + } + else + return QVariant(); + } + else + return YQDesktopFilesModel::data(index, role); } #include "yqmodulegroupsmodel.moc" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/yqmodulegroupsmodel.h Thu May 21 17:16:34 2009 @@ -27,6 +27,13 @@ Q_OBJECT public: + enum Type + { + Regular, + Headline, + Special + }; + YQModuleGroupsModel( QObject * parent = 0 ); ~YQModuleGroupsModel(); @@ -48,7 +55,10 @@ QString groupId( const QModelIndex &idx ) const; private: + QMap <QString, Type> typeMap; + void reindex(); + void addPersonalStuff(); }; #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0