December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60034 - /tags/branch-SLE-10-SP3-2_13_16/
by lslezak＠svn.opensuse.org 10 Dec '09

10 Dec '09

Author: lslezak Date: Thu Dec 10 09:18:01 2009 New Revision: 60034 URL: http://svn.opensuse.org/viewcvs/yast?rev=60034&view=rev Log: Created tag branch-SLE-10-SP3-2_13_16 Added: tags/branch-SLE-10-SP3-2_13_16/ -- 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] r60033 - in /branches/SuSE-SLE-10-SP3-Branch/cd-creator: VERSION package/yast2-cd-creator.changes src/CDCreator.ycp yast2-cd-creator.spec.in
by lslezak＠svn.opensuse.org 10 Dec '09

10 Dec '09

Author: lslezak Date: Thu Dec 10 09:16:38 2009 New Revision: 60033 URL: http://svn.opensuse.org/viewcvs/yast?rev=60033&view=rev Log: - register Pkg::CallbackSourceReportInit/Destroy() callbacks - required after fix of bug #251726 - 2.13.16 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION Thu Dec 10 09:16:38 2009 @@ -1 +1 @@ -2.13.15 +2.13.16 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes Thu Dec 10 09:16:38 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 22 17:00:35 CEST 2009 - lslezak(a)suse.cz + +- register Pkg::CallbackSourceReportInit/Destroy() callbacks - + required after fix of bug #251726 +- 2.13.16 + +------------------------------------------------------------------- Thu Apr 24 13:20:19 CEST 2008 - lslezak(a)suse.cz - add 'post-packages' from autoyast profile into the created Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp Thu Dec 10 09:16:38 2009 @@ -696,6 +696,24 @@ return true; } +void RegisterCallbacks() +{ + Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart"); + Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress"); + Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd"); + Pkg::CallbackSourceReportInit("CDCreator::CallbackSourceReportInit"); + Pkg::CallbackSourceReportDestroy("CDCreator::CallbackSourceReportDestroy"); +} + +void UnregisterCallbacks() +{ + Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); + Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); + Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit"); + Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy"); +} + /** * Create Skeleton * @return boolean true on success @@ -728,6 +746,8 @@ string descrDir = ""; string dataDir = ""; + RegisterCallbacks(); + if (Arch::i386() || Arch::x86_64()) { if (Config["code10"]:false) @@ -752,7 +772,10 @@ meta_local = ReadContentFile(source + "/content"); if (source == "") + { + UnregisterCallbacks(); return false; + } y2milestone("source: %1", source); descr_dir = this_source["productData","descrdir"]:"suse/setup/descr"; @@ -840,7 +863,10 @@ y2debug("source data: %1", this_source["sourceData", "url"]:"" ); success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir)); if (!success) + { + UnregisterCallbacks(); return false; + } Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); @@ -1163,6 +1189,8 @@ // update MD5SUMS file success = success && UpdateMD5File(sformat("%1/%2", skel_root, descrDir)); + UnregisterCallbacks(); + return success; } @@ -1660,6 +1688,15 @@ y2debug("source_id: %1, url: %2, task: %3, error: %4, reason: %5", numeric_id, url, task, error, reason); } +global void CallbackSourceReportInit() +{ + y2debug("CDCreator::CallbackSourceReportInit()"); +} + +global void CallbackSourceReportDestroy() +{ + y2debug("CDCreator::CallbackSourceReportDestroy()"); +} /** * CopyPackages() @@ -1676,9 +1713,7 @@ boolean ret = true; // disable source report callbacks - there is a progress dialog - Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart"); - Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress"); - Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd"); + RegisterCallbacks(); y2milestone("Package summary: %1", toCopy); @@ -1737,9 +1772,7 @@ basedir)) == 0); // restore the source report callbacks - Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); - Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); - Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + UnregisterCallbacks(); return ret; } Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in Thu Dec 10 09:16:38 2009 @@ -8,6 +8,9 @@ Requires: yast2 >= 2.13.90 BuildRequires: yast2 >= 2.13.90 +# Pkg::CallbackSourceCreateInit/Destroy() +Requires: yast2-pkg-bindings >= 2.13.125 + BuildArchitectures: noarch Summary: Configuration of CD-creator -- 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] <rest-service> schubi_after_release : unify checking permissions (bnc#555208)
by Stefan Schubert 09 Dec '09

09 Dec '09

ref: refs/heads/schubi_after_release commit 7261ac7a2547c5425bf48734cb77946772cae7d9 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Dec 9 18:03:25 2009 +0100 unify checking permissions (bnc#555208) --- .../app/controllers/permissions_controller.rb | 1 - webservice/app/models/permission.rb | 42 ++++++++++--------- .../test/functional/permissions_controller_test.rb | 9 +---- webservice/test/unit/permission_test.rb | 15 +++---- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/webservice/app/controllers/permissions_controller.rb b/webservice/app/controllers/permissions_controller.rb index 9b03ebd..fff3c05 100644 --- a/webservice/app/controllers/permissions_controller.rb +++ b/webservice/app/controllers/permissions_controller.rb @@ -35,7 +35,6 @@ class PermissionsController < ApplicationController permission_check "org.opensuse.yast.permissions.read" end permission = Permission.find(:all,params) - logger.debug permission.inspect respond_to do |format| format.json { render :json => permission.to_json } format.xml { render :xml => permission.to_xml } diff --git a/webservice/app/models/permission.rb b/webservice/app/models/permission.rb index c2bf11c..952239f 100644 --- a/webservice/app/models/permission.rb +++ b/webservice/app/models/permission.rb @@ -2,6 +2,7 @@ # Permission class # require 'exceptions' +require 'polkit' class Permission #list of hash { :name => id, :granted => boolean} @@ -55,16 +56,28 @@ class Permission end def mark_granted_permissions_for_user(user) - res = actions_for_user(user).split(/\n/) - res = filter_nonsuse_permissions res - res.each do - |permission| - #not much effective n*m where n is count of permissions and - # m is count of granted permissions - val = @permissions.detect do - |value| value[:id]==permission + @permissions.collect! do + |perm| + begin + if PolKit.polkit_check( perm[:id], user) == :yes + perm[:granted] = true + Rails.logger.debug "Action: #{perm[:id]} User: #{user} Result: ok" + else + perm[:granted] = false + Rails.logger.debug "Action: #{perm[:id]} User: #{user} Result: NOT granted" + end + rescue RuntimeError => e + Rails.logger.info e + if e.message.include?("does not exist") + raise InvalidParameters.new :user_id => "UNKNOWN" + else + raise PolicyKitException.new(e.message, user, perm[:id]) + end + rescue Exception => e + Rails.logger.info e + raise end - val[:granted] = true if val + perm end end private @@ -81,17 +94,6 @@ private end end - def actions_for_user(user_name) - check_username user_name - ret = `LC_ALL=C polkit-auth --user '#{user_name}'` #whitelist usernames so this is secure - Rails.logger.info ret - if $?.exitstatus != 0 || ret.include?("cannot look up uid for user") - Rails.logger.info "status: #{$?.exitstatus} unknown user:"+ret - raise InvalidParameters.new :user_id => "UNKNOWN" - end - return ret || [] - end - def all_actions `polkit-action` end diff --git a/webservice/test/functional/permissions_controller_test.rb b/webservice/test/functional/permissions_controller_test.rb index d40ad63..792667e 100644 --- a/webservice/test/functional/permissions_controller_test.rb +++ b/webservice/test/functional/permissions_controller_test.rb @@ -25,17 +25,10 @@ org.opensuse.yast.permissions.read org.opensuse.yast.permissions.write EOF -TEST_DATA_GRANT = <<EOF -org.opensuse.yast.modules.ysr.statelessregister -org.opensuse.yast.modules.ysr.getregistrationconfig -org.freedesktop.network-manager-settings.system.modify -org.opensuse.yast.module-manager.import -EOF - def setup @request.session[:account_id] = 1 #fixtures Permission.any_instance.stubs(:all_actions).returns(TEST_DATA_ACTIONS) - Permission.any_instance.stubs(:actions_for_user).returns(TEST_DATA_GRANT) + PolKit.stubs(:polkit_check).returns(:yes) end #TODO more tests (not enough permissions etc.) diff --git a/webservice/test/unit/permission_test.rb b/webservice/test/unit/permission_test.rb index 5e5527f..c9b1543 100644 --- a/webservice/test/unit/permission_test.rb +++ b/webservice/test/unit/permission_test.rb @@ -19,20 +19,19 @@ org.opensuse.yast.permissions.read org.opensuse.yast.permissions.write EOF -TEST_DATA_GRANT = <<EOF -org.opensuse.yast.modules.ysr.statelessregister -org.opensuse.yast.modules.ysr.getregistrationconfig -org.freedesktop.network-manager-settings.system.modify -org.opensuse.yast.module-manager.import -EOF - TEST_NONEXIST = <<EOF polkit-auth: cannot look up uid for user 'nonexist' EOF def setup Permission.any_instance.stubs(:all_actions).returns(TEST_DATA_ACTIONS) - Permission.any_instance.stubs(:actions_for_user).returns(TEST_DATA_GRANT) + PolKit.stubs(:polkit_check).returns(:no) + ["org.opensuse.yast.modules.ysr.statelessregister", + "org.opensuse.yast.modules.ysr.getregistrationconfig", + "org.freedesktop.network-manager-settings.system.modify", + "org.opensuse.yast.module-manager.import"].each do |perm| + PolKit.stubs(:polkit_check).with(perm,"test").returns(:yes) + end end def test_find_all -- 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] <rest-service> master : unify checking permissions (bnc#555208)
by Stefan Schubert 09 Dec '09

09 Dec '09

ref: refs/heads/master commit 7261ac7a2547c5425bf48734cb77946772cae7d9 Author: Stefan Schubert <schubi(a)suse.de> Date: Wed Dec 9 18:03:25 2009 +0100 unify checking permissions (bnc#555208) --- .../app/controllers/permissions_controller.rb | 1 - webservice/app/models/permission.rb | 42 ++++++++++--------- .../test/functional/permissions_controller_test.rb | 9 +---- webservice/test/unit/permission_test.rb | 15 +++---- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/webservice/app/controllers/permissions_controller.rb b/webservice/app/controllers/permissions_controller.rb index 9b03ebd..fff3c05 100644 --- a/webservice/app/controllers/permissions_controller.rb +++ b/webservice/app/controllers/permissions_controller.rb @@ -35,7 +35,6 @@ class PermissionsController < ApplicationController permission_check "org.opensuse.yast.permissions.read" end permission = Permission.find(:all,params) - logger.debug permission.inspect respond_to do |format| format.json { render :json => permission.to_json } format.xml { render :xml => permission.to_xml } diff --git a/webservice/app/models/permission.rb b/webservice/app/models/permission.rb index c2bf11c..952239f 100644 --- a/webservice/app/models/permission.rb +++ b/webservice/app/models/permission.rb @@ -2,6 +2,7 @@ # Permission class # require 'exceptions' +require 'polkit' class Permission #list of hash { :name => id, :granted => boolean} @@ -55,16 +56,28 @@ class Permission end def mark_granted_permissions_for_user(user) - res = actions_for_user(user).split(/\n/) - res = filter_nonsuse_permissions res - res.each do - |permission| - #not much effective n*m where n is count of permissions and - # m is count of granted permissions - val = @permissions.detect do - |value| value[:id]==permission + @permissions.collect! do + |perm| + begin + if PolKit.polkit_check( perm[:id], user) == :yes + perm[:granted] = true + Rails.logger.debug "Action: #{perm[:id]} User: #{user} Result: ok" + else + perm[:granted] = false + Rails.logger.debug "Action: #{perm[:id]} User: #{user} Result: NOT granted" + end + rescue RuntimeError => e + Rails.logger.info e + if e.message.include?("does not exist") + raise InvalidParameters.new :user_id => "UNKNOWN" + else + raise PolicyKitException.new(e.message, user, perm[:id]) + end + rescue Exception => e + Rails.logger.info e + raise end - val[:granted] = true if val + perm end end private @@ -81,17 +94,6 @@ private end end - def actions_for_user(user_name) - check_username user_name - ret = `LC_ALL=C polkit-auth --user '#{user_name}'` #whitelist usernames so this is secure - Rails.logger.info ret - if $?.exitstatus != 0 || ret.include?("cannot look up uid for user") - Rails.logger.info "status: #{$?.exitstatus} unknown user:"+ret - raise InvalidParameters.new :user_id => "UNKNOWN" - end - return ret || [] - end - def all_actions `polkit-action` end diff --git a/webservice/test/functional/permissions_controller_test.rb b/webservice/test/functional/permissions_controller_test.rb index d40ad63..792667e 100644 --- a/webservice/test/functional/permissions_controller_test.rb +++ b/webservice/test/functional/permissions_controller_test.rb @@ -25,17 +25,10 @@ org.opensuse.yast.permissions.read org.opensuse.yast.permissions.write EOF -TEST_DATA_GRANT = <<EOF -org.opensuse.yast.modules.ysr.statelessregister -org.opensuse.yast.modules.ysr.getregistrationconfig -org.freedesktop.network-manager-settings.system.modify -org.opensuse.yast.module-manager.import -EOF - def setup @request.session[:account_id] = 1 #fixtures Permission.any_instance.stubs(:all_actions).returns(TEST_DATA_ACTIONS) - Permission.any_instance.stubs(:actions_for_user).returns(TEST_DATA_GRANT) + PolKit.stubs(:polkit_check).returns(:yes) end #TODO more tests (not enough permissions etc.) diff --git a/webservice/test/unit/permission_test.rb b/webservice/test/unit/permission_test.rb index 5e5527f..c9b1543 100644 --- a/webservice/test/unit/permission_test.rb +++ b/webservice/test/unit/permission_test.rb @@ -19,20 +19,19 @@ org.opensuse.yast.permissions.read org.opensuse.yast.permissions.write EOF -TEST_DATA_GRANT = <<EOF -org.opensuse.yast.modules.ysr.statelessregister -org.opensuse.yast.modules.ysr.getregistrationconfig -org.freedesktop.network-manager-settings.system.modify -org.opensuse.yast.module-manager.import -EOF - TEST_NONEXIST = <<EOF polkit-auth: cannot look up uid for user 'nonexist' EOF def setup Permission.any_instance.stubs(:all_actions).returns(TEST_DATA_ACTIONS) - Permission.any_instance.stubs(:actions_for_user).returns(TEST_DATA_GRANT) + PolKit.stubs(:polkit_check).returns(:no) + ["org.opensuse.yast.modules.ysr.statelessregister", + "org.opensuse.yast.modules.ysr.getregistrationconfig", + "org.freedesktop.network-manager-settings.system.modify", + "org.opensuse.yast.module-manager.import"].each do |perm| + PolKit.stubs(:polkit_check).with(perm,"test").returns(:yes) + end end def test_find_all -- 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] r60032 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: aschnell Date: Wed Dec 9 17:47:15 2009 New Revision: 60032 URL: http://svn.opensuse.org/viewcvs/yast?rev=60032&view=rev Log: - use getFreeInfo from libstorage to detect home partitions Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.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 Wed Dec 9 17:47:15 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 09 17:44:27 CET 2009 - aschnell(a)suse.de + +- use getFreeInfo from libstorage to detect home partitions + +------------------------------------------------------------------- Thu Dec 03 15:45:27 CET 2009 - aschnell(a)suse.de - log untranslated messages (requires libstorage 2.19.2) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Dec 9 17:47:15 2009 @@ -3463,57 +3463,33 @@ return( MountOpt( dev, mp, "" ) ); } -global define map DetectHomeFs( map p ) + +boolean DetectHomeFs( map p ) { y2milestone( "DetectHomeFs p:%1", p ); - map ret = $[]; - boolean home = false; - list poss_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; + boolean ret = false; + list<symbol> poss_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; + string device = p["device"]:""; if( !p["created"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) && - size(p["device"]:"")>0 ) - { - boolean mount_ok = false; - string tmpdir = (string) SCR::Read(.target.tmpdir) + "/tmp-home-mp"; - SCR::Execute(.target.mkdir, tmpdir ); - string fsto = FileSystems::DefaultFstabOptions( p ); - mount_ok = Storage::MountOpt( p["device"]:"", tmpdir, fsto ); - if( !mount_ok ) - mount_ok = Storage::Mount( p["device"]:"", tmpdir ); - else - ret["fstopt"] = fsto; - if( mount_ok ) - { - list skip = [ ".", "..", "root" ]; - list tfile = [ ".profile", ".ssh", ".bashrc", ".kde2", ".gnome2", ".kde", ".gnome" ]; - list<string> files = (list<string>)SCR::Read (.target.dir, tmpdir); - y2milestone( "DetectHomeFs files:%1", files ); - integer count=0; - - while( !home && count<size(files) ) - { - string td = tmpdir + "/" + files[count]:""; - if( !contains( skip, files[count]:"" ) && - FileUtils::IsDirectory( td ) ) - { - integer i=0; - while( !home && i<size(tfile) ) - { - string tname = td + "/" + tfile[i]:""; - home = FileUtils::GetSize( tname )>0; - i = i+1; - } - } - count = count+1; - } - Storage::Umount( p["device"]:"" ); - } - SCR::Execute( .target.bash, "rmdir " + tmpdir ); - } - ret["ishome"] = home; - y2milestone( "DetectHomeFs ret:%1", ret ); - return( ret ); + !isempty(device) ) + { + integer used = 0; + integer resize_free = 0; + integer df_free = 0; + boolean win_disk = false; + boolean efi = false; + boolean home = false; + + if (LibStorage::StorageInterface::getFreeInfo(sint, device, resize_free, + df_free, used, win_disk, + efi, home, true)) + ret = home; + } + y2milestone("DetectHomeFs device:%1 ret:%2", device, ret); + return ret; } + global define map SetVolOptions( map p, string mnt, symbol fs, string fs_opts, string fstab_opts, string label ) { @@ -3543,14 +3519,13 @@ ret["detected_fs"]:`unknown != `unknown && mnt=="/home" ) { boolean lvm = p["type"]:`primary == `lvm; - map h = DetectHomeFs( ret ); if( ( lvm && ret["name"]:""=="home") || - (!lvm && h["ishome"]:false ) ) + (!lvm && DetectHomeFs(ret))) { ret["format"] = false; ret["used_fs"] = ret["detected_fs"]:`unknown; - if( size(fstab_opts)==0 ) - fstab_opts = h["fstopt"]:""; + if (isempty(fstab_opts)) + fstab_opts = FileSystems::DefaultFstabOptions(ret); } } if( ret["format"]:false && !ret["create"]:false && -- 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] r60031 - in /trunk/storage/storage/src/modules: Partitions.ycp Storage.ycp
by aschnell＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: aschnell Date: Wed Dec 9 17:42:43 2009 New Revision: 60031 URL: http://svn.opensuse.org/viewcvs/yast?rev=60031&view=rev Log: - improvements for testmode Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Wed Dec 9 17:42:43 2009 @@ -309,7 +309,7 @@ { ret = true; } - y2milestone( "NeedBoot ret %1", ret ); + y2milestone( "NeedBoot ret:%1", ret ); return ret; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Dec 9 17:42:43 2009 @@ -243,7 +243,7 @@ { any env = LibStorage::Environment::new("LibStorage::Environment", readonly); LibStorage::Environment::swig_testmode_set(env, Mode::test()); - LibStorage::Environment::swig_autodetect_set(env, true); + LibStorage::Environment::swig_autodetect_set(env, !Mode::test()); LibStorage::Environment::swig_instsys_set(env, Mode::installation() || Mode::repair()); integer locker_pid = 0; @@ -3012,8 +3012,11 @@ LibStorage::StorageInterface::removeDmTableTo( sint, device ); } -global define boolean CheckSwapable( string dev ) +global boolean CheckSwapable( string dev ) { + if (Mode::test()) + return true; + string cmd = "swapon " + dev; boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0; if( ok ) -- 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] <rest-service> jr-basemodel : add json serialization to base model
by Josef Reidinger 09 Dec '09

09 Dec '09

ref: refs/heads/jr-basemodel commit 5ae976bdb6d864f66281e5393eaae28e0ad85b21 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 9 17:29:14 2009 +0100 add json serialization to base model --- webservice/lib/base_model/serialization.rb | 3 +- .../lib/base_model/serializers/json_serializer.rb | 23 ++++++++++++++++++++ webservice/test/unit/base_model_test.rb | 10 ++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/webservice/lib/base_model/serialization.rb b/webservice/lib/base_model/serialization.rb index 56a8a86..f822afa 100644 --- a/webservice/lib/base_model/serialization.rb +++ b/webservice/lib/base_model/serialization.rb @@ -1,7 +1,7 @@ module BaseModel module Serialization class Serializer - attr_reader :options + attr_reader :options, :attributes def initialize(model,options={}) @model = model @@ -35,3 +35,4 @@ module BaseModel end end require 'base_model/serializers/xml_serializer' +require 'base_model/serializers/json_serializer' diff --git a/webservice/lib/base_model/serializers/json_serializer.rb b/webservice/lib/base_model/serializers/json_serializer.rb new file mode 100644 index 0000000..f67e0bb --- /dev/null +++ b/webservice/lib/base_model/serializers/json_serializer.rb @@ -0,0 +1,23 @@ +require 'active_support/json' +module BaseModel + module Serialization + def to_json(options={},&block) + super + end + + def from_json(json) + hash = ActiveSupport::JSON.decode(json) + load(hash.values.first) + end + + def as_json(options={}) + hash = {} + Serializer.new(self,options).attributes.each do |attr| + hash[attr.to_s[1..-1]] = instance_variable_get(attr) + end + hash = { self.class.model_name.singular => hash } + hash + end + + end +end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 0e9c1b0..7be9418 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -63,4 +63,14 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 end + + def test_json_serialization + test= Test.new(MASS_DATA) + json = test.to_json + assert json + test2 = Test.new + test2.from_json json + assert_equal "last", test2.arg1 + assert_equal "5", test2.arg2 + end end -- 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] <rest-service> master : add json serialization to base model
by Josef Reidinger 09 Dec '09

09 Dec '09

ref: refs/heads/master commit 5ae976bdb6d864f66281e5393eaae28e0ad85b21 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 9 17:29:14 2009 +0100 add json serialization to base model --- webservice/lib/base_model/serialization.rb | 3 +- .../lib/base_model/serializers/json_serializer.rb | 23 ++++++++++++++++++++ webservice/test/unit/base_model_test.rb | 10 ++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/webservice/lib/base_model/serialization.rb b/webservice/lib/base_model/serialization.rb index 56a8a86..f822afa 100644 --- a/webservice/lib/base_model/serialization.rb +++ b/webservice/lib/base_model/serialization.rb @@ -1,7 +1,7 @@ module BaseModel module Serialization class Serializer - attr_reader :options + attr_reader :options, :attributes def initialize(model,options={}) @model = model @@ -35,3 +35,4 @@ module BaseModel end end require 'base_model/serializers/xml_serializer' +require 'base_model/serializers/json_serializer' diff --git a/webservice/lib/base_model/serializers/json_serializer.rb b/webservice/lib/base_model/serializers/json_serializer.rb new file mode 100644 index 0000000..f67e0bb --- /dev/null +++ b/webservice/lib/base_model/serializers/json_serializer.rb @@ -0,0 +1,23 @@ +require 'active_support/json' +module BaseModel + module Serialization + def to_json(options={},&block) + super + end + + def from_json(json) + hash = ActiveSupport::JSON.decode(json) + load(hash.values.first) + end + + def as_json(options={}) + hash = {} + Serializer.new(self,options).attributes.each do |attr| + hash[attr.to_s[1..-1]] = instance_variable_get(attr) + end + hash = { self.class.model_name.singular => hash } + hash + end + + end +end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 0e9c1b0..7be9418 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -63,4 +63,14 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 end + + def test_json_serialization + test= Test.new(MASS_DATA) + json = test.to_json + assert json + test2 = Test.new + test2.from_json json + assert_equal "last", test2.arg1 + assert_equal "5", test2.arg2 + end end -- 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] r60030 - in /trunk/printer: package/yast2-printer.changes src/Printer.ycp src/connectionwizard.ycp
by jsmeix＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: jsmeix Date: Wed Dec 9 17:27:59 2009 New Revision: 60030 URL: http://svn.opensuse.org/viewcvs/yast?rev=60030&view=rev Log: Next version 2.19.1 with yast2-printer.changes entry: - An existing connection can be modified by the "Connection Wizard" which launches with a matching sub-dialog where the values of the existing connection are preset or it falls back to the "Specify Arbitrary Device URI" sub-dialog if the existing URI scheme does not match to a more specific sub-dialog (see Novell/Suse Bugzilla bnc#553871). - Added support for current_queue_name and current_device_uri in Printer.ycp, overview.ycp, basicadd.ycp, and basicmodify.ycp which means that the currently used queue and/or connection is preselected in the Overview and/or Add/Modify dialogs (i.e. there no longer only the default Table widget prelelection which preselects the topmost item). - Replaced several duplicated code blocks in basicmodify.ycp, basicadd.ycp, and connectionwizard.ycp by calling the new added DeriveModelName and DeriveDriverFilterString functions in Printer.ycp. - Added "bugfix-support" for username and password in ipp/http URIs and for username in lpd URIs. "Bugfix-support" means that there is no support to set up URIs with those stuff because the CUPS main author Michael Sweet really does not want to encourage its use but when it is already there in an existing URI, it is at least shown correctly. Usually username and password components for ipp/http and lpd URIs are shown in the matching "Connection Wizard" sub-dialog in the hostname field in the form username:password@hostname for ipp/http and username@hostname for lpd URIs (see Novell/Suse Bugzilla bnc#512549). - Connection Wizard: test connection does no longer require printer manufacturer (see Novell/Suse Bugzilla bnc#536461). - Enhanced error messages in the test_remote_* tools to indicate possible reasons for the error (see Novell/Suse Bugzilla bnc#553872). - In Printer.ycp replaced "Detected printers" by "Printer detection finished" (see Novell/Suse Bugzilla bnc#533584). - Added BrowsePoll support for "Print via Network" (see Novell/Suse Bugzilla bnc#433047). - Added bugfixes and minor support for local classes: Local classes are shown as "class" (not as "remote") and one can delete a local class but there is no support to add or edit classes. - 2.19.1 Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/connectionwizard.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Dec 9 17:27:59 2009 @@ -1,4 +1,53 @@ ------------------------------------------------------------------- +Wed Dec 9 12:51:58 CET 2009 - jsmeix(a)suse.de + +- An existing connection can be modified by the "Connection Wizard" + which launches with a matching sub-dialog where the values + of the existing connection are preset or it falls back to the + "Specify Arbitrary Device URI" sub-dialog if the existing + URI scheme does not match to a more specific sub-dialog + (see Novell/Suse Bugzilla bnc#553871). +- Added support for current_queue_name and current_device_uri in + Printer.ycp, overview.ycp, basicadd.ycp, and basicmodify.ycp + which means that the currently used queue and/or connection + is preselected in the Overview and/or Add/Modify dialogs + (i.e. there no longer only the default Table widget + prelelection which preselects the topmost item). +- Replaced several duplicated code blocks in basicmodify.ycp, + basicadd.ycp, and connectionwizard.ycp by calling the new + added DeriveModelName and DeriveDriverFilterString functions + in Printer.ycp. +- Added "bugfix-support" for username and password + in ipp/http URIs and for username in lpd URIs. + "Bugfix-support" means that there is no support + to set up URIs with those stuff because the CUPS + main author Michael Sweet really does not want to + encourage its use but when it is already there + in an existing URI, it is at least shown correctly. + Usually username and password components for + ipp/http and lpd URIs are shown in the matching + "Connection Wizard" sub-dialog in the hostname field + in the form username:password@hostname for ipp/http + and username@hostname for lpd URIs + (see Novell/Suse Bugzilla bnc#512549). +- Connection Wizard: test connection does no longer + require printer manufacturer + (see Novell/Suse Bugzilla bnc#536461). +- Enhanced error messages in the test_remote_* tools + to indicate possible reasons for the error + (see Novell/Suse Bugzilla bnc#553872). +- In Printer.ycp replaced "Detected printers" + by "Printer detection finished" + (see Novell/Suse Bugzilla bnc#533584). +- Added BrowsePoll support for "Print via Network" + (see Novell/Suse Bugzilla bnc#433047). +- Added bugfixes and minor support for local classes: + Local classes are shown as "class" (not as "remote") + and one can delete a local class but there is no support + to add or edit classes. +- 2.19.1 + +------------------------------------------------------------------- Fri Oct 30 11:53:06 CET 2009 - jsmeix(a)suse.de - Added a generic test if a firewall is used to Printerlib.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6003… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Dec 9 17:27:59 2009 @@ -1123,6 +1123,7 @@ // and take the connection_filter_string into account (if it is not the empty string). list< term > connection_items = []; list< term > sorted_connection_items = []; + list< string > already_added_uris = []; boolean an_item_was_added = false; integer connections_index = -1; string uri = ""; @@ -1139,106 +1140,93 @@ model = connection_entry["model"]:""; info = connection_entry["info"]:""; class = connection_entry["class"]:""; - if( uri != "" ) - { // Take the filter_string into account: - if( "" == connection_filter_string ) - { // Add trailing spaces because the current YaST UI - // has almost no additional space between table columns - // in partitcular not where the widest entry in a column is: - connection_items = add( connection_items, `item( `id( connections_index ), - model + " ", - uri + " ", - info - ) - ); - an_item_was_added = true; - } - else - { // If the connection_filter_string is the special string "BasicAddDialog", - // do a special filtering for those connections which are suitable - // for the BasicAddDialog (i.e. only parallel, usb, and hp connections): - if( "BasicAddDialog" == connection_filter_string ) - { if( "parallel:/" == substring( uri, 0, 10 ) - || "usb:/" == substring( uri, 0, 5 ) - || "hp:/" == substring( uri, 0, 4 ) - || "ConnectionWizardDialog" == class + // Skip effectively empty (i.e. useless) entries: + if( "" == uri ) + { continue; + } + // Skip duplicate URIs because it does not make sense + // to show more than one entry with the same URI because + // for CUPS only different URIs distinguish different devices. + // For example two same USB printer models without different serial numbers + // are indistinguishable for CUPS so that any printout would be sent only + // to one of both devices (probably the first one in the USB device list): + if( contains( already_added_uris, uri ) ) + { y2milestone( "skipped connection_entry with duplicate DeviceURI: '%1'", connection_entry ); + continue; + } + // Take the filter_string into account: + if( "" == connection_filter_string ) + { // Add trailing spaces because the current YaST UI + // has almost no additional space between table columns + // in partitcular not where the widest entry in a column is: + connection_items = add( connection_items, `item( `id( connections_index ), + model + " ", + uri + " ", + info + ) + ); + an_item_was_added = true; + } + else + { // If the connection_filter_string is the special string "BasicAddDialog", + // do a special filtering for those connections which are suitable + // for the BasicAddDialog (i.e. only parallel, usb, and hp connections): + if( "BasicAddDialog" == connection_filter_string ) + { if( "parallel:/" == substring( uri, 0, 10 ) + || "usb:/" == substring( uri, 0, 5 ) + || "hp:/" == substring( uri, 0, 4 ) + || "ConnectionWizardDialog" == class + ) + { // Skip "usb://HP/" DeviceURIs if it was not created by the Connection Wizard + // and if there is at least one "hp:/usb/" DeviceURI + // so that the "hp:/usb/" DeviceURI is used with preference. + // The "usb://HP/" DeviceURI is still available via "MoreConnections". + // It can happen that a "usb://HP/" DeviceURI is skipped + // without a matching "hp:/usb/" DeviceURI because + // the "hp" backend lists only devices which are known as supported by HPLIP. + // If there are two HP printers connected but only one is supported by HPLIP, + // there exists one "hp:/usb/" DeviceURI and therefore all "usb://HP/" DeviceURIs + // are skipped even the one for the HP printer which is unknown to HPLIP. + // But this is no real problem because all "usb://HP/" DeviceURIs are still + // available via "MoreConnections". + // Actually it is even good that HP printers which are unknown to HPLIP + // are skipped by default because usually we do not provide a driver + // for such printers so that the extra-cklick on "MoreConnections" may + // make the user aware that something is fishy with this particular model + // so that the user hopefully pays more attention which driver he selects. + // If a HP printer is unknown to HPLIP it does not mean that it is unsupported + // (it does also not mean that it is unsupported by HPLIP) because + // it could be simply a new model which is not yet known to HPLIP + // but compatible to a known model. In this case the user must pay attention + // which exact driver he selects manually for his particular model. + if( "usb://hp/" == tolower( substring( uri, 0, 9 ) ) + && hp_usb_uri_exists + && class != "ConnectionWizardDialog" ) - { // Skip "usb://HP/" DeviceURIs if it was not created by the Connection Wizard - // and if there is at least one "hp:/usb/" DeviceURI - // so that the "hp:/usb/" DeviceURI is used with preference. - // The "usb://HP/" DeviceURI is still available via "MoreConnections". - // It can happen that a "usb://HP/" DeviceURI is skipped - // without a matching "hp:/usb/" DeviceURI because - // the "hp" backend lists only devices which are known as supported by HPLIP. - // If there are two HP printers connected but only one is supported by HPLIP, - // there exists one "hp:/usb/" DeviceURI and therefore all "usb://HP/" DeviceURIs - // are skipped even the one for the HP printer which is unknown to HPLIP. - // But this is no real problem because all "usb://HP/" DeviceURIs are still - // available via "MoreConnections". - // Actually it is even good that HP printers which are unknown to HPLIP - // are skipped by default because usually we do not provide a driver - // for such printers so that the extra-cklick on "MoreConnections" may - // make the user aware that something is fishy with this particular model - // so that the user hopefully pays more attention which driver he selects. - // If a HP printer is unknown to HPLIP it does not mean that it is unsupported - // (it does also not mean that it is unsupported by HPLIP) because - // it could be simply a new model which is not yet known to HPLIP - // but compatible to a known model. In this case the user must pay attention - // which exact driver he selects manually for his particular model. - if( "usb://hp/" == tolower( substring( uri, 0, 9 ) ) - && hp_usb_uri_exists + { y2milestone( "skipped 'usb://HP/' DeviceURI '%1'", uri ); + } + else + { // Skip "hp:/par/" DeviceURIs if it was not created by the Connection Wizard + // and if there is at least one "parallel:/" DeviceURI + // so that the "parallel:/" DeviceURI is used with preference. + // The reason for this preference is that for my LaserJet 1220 + // which is accessible via "parallel:/dev/lp0" and + // via "hp:/par/HP_LaserJet_1220?device=/dev/parport0" + // it does not work for the "hp:/par/" DeviceURI and in /var/log/messages there is + // ... parport0: io/hpmud/pp.c 517: compat_write_data transfer stalled + // ... parport0: io/hpmud/musb.c 1339: unable to write data + // hp:/par/HP_LaserJet_1220?device=/dev/parport0: Resource temporarily unavailable + // so that the generic "parallel:/" DeviceURI seems to be the better fail-safe default. + // It should not happen that a "hp:/par/" DeviceURI is skipped without + // having a matching generic "parallel:/" DeviceURI available. + // The "hp:/par/" DeviceURI is still available via "MoreConnections". + if( "hp:/par/" == tolower( substring( uri, 0, 8 ) ) + && parallel_uri_exists && class != "ConnectionWizardDialog" ) - { y2milestone( "skipped 'usb://HP/' DeviceURI '%1'", uri ); + { y2milestone( "skipped 'hp:/par/' DeviceURI '%1'", uri ); } else - { // Skip "hp:/par/" DeviceURIs if it was not created by the Connection Wizard - // and if there is at least one "parallel:/" DeviceURI - // so that the "parallel:/" DeviceURI is used with preference. - // The reason for this preference is that for my LaserJet 1220 - // which is accessible via "parallel:/dev/lp0" and - // via "hp:/par/HP_LaserJet_1220?device=/dev/parport0" - // it does not work for the "hp:/par/" DeviceURI and in /var/log/messages there is - // ... parport0: io/hpmud/pp.c 517: compat_write_data transfer stalled - // ... parport0: io/hpmud/musb.c 1339: unable to write data - // hp:/par/HP_LaserJet_1220?device=/dev/parport0: Resource temporarily unavailable - // so that the generic "parallel:/" DeviceURI seems to be the better fail-safe default. - // It should not happen that a "hp:/par/" DeviceURI is skipped without - // having a matching generic "parallel:/" DeviceURI available. - // The "hp:/par/" DeviceURI is still available via "MoreConnections". - if( "hp:/par/" == tolower( substring( uri, 0, 8 ) ) - && parallel_uri_exists - && class != "ConnectionWizardDialog" - ) - { y2milestone( "skipped 'hp:/par/' DeviceURI '%1'", uri ); - } - else - { // Add trailing spaces because the current YaST UI - // has almost no additional space between table columns - // in partitcular not where the widest entry in a column is: - connection_items = add( connection_items, `item( `id( connections_index ), - model + " ", - uri + " ", - info - ) - ); - an_item_was_added = true; - } - } - } - } - else - { // If the connection_filter_string is the special string "MoreConnections", - // do a special filtering for those connections which are supposed to work - // i.e. where the uri seems to be a complete DeviceURI e.g. "socket://192.168.1.2:9100" - // and not just an URI scheme like a plain "socket". - // It doesn't matter if backends (i.e. schemes) with non alphanumeric characters - // are skipped here because for unusual backends there is the "Connection Wizard": - if( "MoreConnections" == connection_filter_string ) - { // if( issubstring ( uri , ":/" ) ) - if( regexpmatch( uri, "^[" + alnum_chars + "]+:/" ) - || "ConnectionWizardDialog" == class - ) { // Add trailing spaces because the current YaST UI // has almost no additional space between table columns // in partitcular not where the widest entry in a column is: @@ -1251,33 +1239,57 @@ an_item_was_added = true; } } - else - { // If the connection_filter_string is a usual non-empty string, - // test whether the model matches to the connection_filter_string: - if( regexpmatch( tolower( model ), tolower( connection_filter_string ) ) ) - { // Add trailing spaces because the current YaST UI - // has almost no additional space between table columns - // in partitcular not where the widest entry in a column is: - connection_items = add( connection_items, `item( `id( connections_index ), - model + " ", - uri + " ", - info - ) - ); - an_item_was_added = true; - } + } + } + else + { // If the connection_filter_string is the special string "MoreConnections", + // do a special filtering for those connections which are supposed to work + // i.e. where the uri seems to be a complete DeviceURI e.g. "socket://192.168.1.2:9100" + // and not just an URI scheme like a plain "socket". + // It doesn't matter if backends (i.e. schemes) with non alphanumeric characters + // are skipped here because for unusual backends there is the "Connection Wizard": + if( "MoreConnections" == connection_filter_string ) + { // if( issubstring ( uri , ":/" ) ) + if( regexpmatch( uri, "^[" + alnum_chars + "]+:/" ) + || "ConnectionWizardDialog" == class + ) + { // Add trailing spaces because the current YaST UI + // has almost no additional space between table columns + // in partitcular not where the widest entry in a column is: + connection_items = add( connection_items, `item( `id( connections_index ), + model + " ", + uri + " ", + info + ) + ); + an_item_was_added = true; + } + } + else + { // If the connection_filter_string is a usual non-empty string, + // test whether the model matches to the connection_filter_string: + if( regexpmatch( tolower( model ), tolower( connection_filter_string ) ) ) + { // Add trailing spaces because the current YaST UI + // has almost no additional space between table columns + // in partitcular not where the widest entry in a column is: + connection_items = add( connection_items, `item( `id( connections_index ), + model + " ", + uri + " ", + info + ) + ); + an_item_was_added = true; } } } - if( an_item_was_added - && "" != current_device_uri - ) + } + if( an_item_was_added ) + { already_added_uris = add( already_added_uris, uri ); + if( current_device_uri == uri ) { // Set selected_connections_index when the current_device_uri is in the list so that // BasicAddDialog and BasicModifyDialog can preselect the currently used connection // via its id in the list which is the selected_connections_index. - if( current_device_uri == uri ) - { selected_connections_index = connections_index; - } + selected_connections_index = connections_index; } } } @@ -1414,29 +1426,31 @@ string nickname = ppd_entry["nickname"]:""; string deviceID = ppd_entry["deviceID"]:""; string language = ppd_entry["language"]:""; + // Skip effectively empty (i.e. useless) entries: + if( "" == ppd || "" == nickname ) + { continue; + } // Build the entry: - if( ppd != "" && nickname != "" ) - { driver_string = nickname + " [" + ppd + "]"; - // Take the filter_string into account: - if( "" == driver_filter_string ) + driver_string = nickname + " [" + ppd + "]"; + // Take the filter_string into account: + if( "" == driver_filter_string ) + { driver_items = add( driver_items, `item( `id( ppds_index ), driver_string ) ); + } + else + { // If the driver_filter_string is a non-empty string, + // test whether nickname or deviceID matches to the driver_filter_string. + // Only the special character '+' is also taken into account because + // this is sometimes also a meaningful character in the model name + // for example the '+' at the end of a Kyocera model name + // indicates that this model has a built-in PostScript interpreter + // while the model without the '+' understands only PCL. + string unified_nickname = filterchars( tolower( nickname ), lower_alnum_chars + "+" ); + string unified_deviceID = filterchars( tolower( deviceID ), lower_alnum_chars + "+" ); + if( regexpmatch( unified_nickname, driver_filter_string ) + || regexpmatch( unified_deviceID, driver_filter_string ) + ) { driver_items = add( driver_items, `item( `id( ppds_index ), driver_string ) ); } - else - { // If the driver_filter_string is a non-empty string, - // test whether nickname or deviceID matches to the driver_filter_string. - // Only the special character '+' is also taken into account because - // this is sometimes also a meaningful character in the model name - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - string unified_nickname = filterchars( tolower( nickname ), lower_alnum_chars + "+" ); - string unified_deviceID = filterchars( tolower( deviceID ), lower_alnum_chars + "+" ); - if( regexpmatch( unified_nickname, driver_filter_string ) - || regexpmatch( unified_deviceID, driver_filter_string ) - ) - { driver_items = add( driver_items, `item( `id( ppds_index ), driver_string ) ); - } - } } } ); Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Wed Dec 9 17:27:59 2009 @@ -247,15 +247,54 @@ } term getContentFromBackend( string backend ) -{ list items = []; +{ list connection_items = []; backend = backend + ":/"; - foreach( term row, + string current_device_uri = getCurrentDeviceURI(); + boolean current_device_uri_found = false; + term current_connection_item = nil; + foreach( term connection_item, (list<term>)Printer::ConnectionItems( "" ), - { if( backend == substring( row[2]:"", 0, size(backend) ) ) - { items = add( items, row ); + { // A connection_item is `item( `id(connections_index), model, uri, info ) + // but Printer::ConnectionItems adds a trailing space character to model and uri + // (because the current YaST UI has almost no additional space between table columns) + // so that the last character must be removed to get the correct device URI value: + string uri = connection_item[2]:""; + uri = substring( uri, 0, size(uri) - 1 ); + if( backend == substring( uri, 0, size(backend) ) ) + { if( current_device_uri == uri ) + { current_device_uri_found = true; + current_connection_item = connection_item; + } + else + { connection_items = add( connection_items, connection_item ); + } } } ); + if( backend == substring( current_device_uri, 0, size(backend) ) ) + { if( ! current_device_uri_found ) + { // The current connection is no longer vaild. + // Nevertheless the current connection must be topmost to be preselected because + // anything else which might be topmost and preselected (even an empty value) + // would silently change the current connection to the preselected one + // when the user clicks [OK]: + connection_items = prepend( connection_items, + // Add trailing spaces because the current YaST UI + // has almost no additional space between table columns + // in partitcular not where the widest entry in a column is: + `item( `id( -1 ), + "Unknown" + " ", + current_device_uri + " ", + "No longer valid (printer not connected?)" + ) + ); + } + else + { // Add the current connection topmost to be preselected + // via the default Table widget preselection: + connection_items = prepend( connection_items, current_connection_item ); + } + } term content = `VBox ( `Table ( `id(`connection_selection), @@ -277,7 +316,7 @@ // Additional description of the printer or its particular connection: _("Description") ), - items + connection_items ) ); return content; @@ -1941,7 +1980,16 @@ _("Select a connection"), // Body of a Popup::AnyMessage when no connection was selected // because there is no connection available to be selected: - _("If no connection is shown here, it is not possible\nto access the device via this type of connection. ") + _("If no connection is shown here, it is not possible\nto access the device via this type of connection.\nWas the printer connected and switched on all the time?") + ); + break; + } + if( selected_connection_index < 0 ) + { Popup::AnyMessage( // Header of a Popup::AnyMessage when an invalid connection was selected: + _("Select a valid connection"), + // Body of a Popup::AnyMessage when an invalid connection was selected + // because the current connection is no longer valid: + _("When the current connection is no longer valid,\nit does no longer work to access the device via this connection.\nIs the printer still connected and switched on?") ); 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] r60029 - in /branches/SuSE-Code-11-SP1-Branch/s390: package/yast2-s390.changes src/modules/DASDController.ycp
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 17:11:36 2009 New Revision: 60029 URL: http://svn.opensuse.org/viewcvs/yast?rev=60029&view=rev Log: loging more verbose (log exit code when activate DASD) Modified: branches/SuSE-Code-11-SP1-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-SP1-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/s390/package/yast2-s390.changes Wed Dec 9 17:11:36 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 9 17:10:49 CET 2009 - mzugec(a)suse.cz + +- loging more verbose (log exit code when activate DASD) + +------------------------------------------------------------------- Tue Dec 1 14:03:22 CET 2009 - mzugec(a)suse.cz - fixed desktop files (bnc#559343) Modified: branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/s390/src/modules/DASDController.ycp Wed Dec 9 17:11:36 2009 @@ -426,8 +426,8 @@ 1, diag ? 1 : 0 ); - y2milestone ("Running command %1", command); integer ret = (integer)SCR::Execute (.target.bash, command); + y2milestone ("Running command %1 with exit code %2", command, ret); if (ret == 5){ if (Popup::ContinueCancel(_("Device is not DASD. Format device?"))){ string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0