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