October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66361 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd.ycp
by aschnell＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: aschnell Date: Mon Oct 10 15:18:27 2011 New Revision: 66361 URL: http://svn.opensuse.org/viewcvs/yast?rev=66361&view=rev Log: - disable call of smartctl for certain RAIDs (bnc#720956) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd.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 Mon Oct 10 15:18:27 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 10 15:05:41 CEST 2011 - aschnell(a)suse.de + +- disable call of smartctl for certain RAIDs (bnc#720956) + +------------------------------------------------------------------- Thu Oct 6 12:36:26 CEST 2011 - fehr(a)suse.de - version 2.21.8 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 Oct 10 15:18:27 2011 @@ -242,6 +242,39 @@ } + boolean DiskMaySupportSmart(string disk_device) + { + if (String::StartsWith(disk_device, "/dev/dasd")) + return false; + + map<string, map> target_map = Storage::GetTargetMap(); + map disk = target_map[disk_device]:$[]; + + if (disk["type"]:`CT_UNKNOWN != `CT_DISK) + return false; + + if (contains([ "3w-9xxx" ], disk["driver"]:"")) + return false; + + return true; + } + + + boolean DiskMaySupportHdparm(string disk_device) + { + if (String::StartsWith(disk_device, "/dev/dasd")) + return false; + + map<string, map> target_map = Storage::GetTargetMap(); + map disk = target_map[disk_device]:$[]; + + if (disk["type"]:`CT_UNKNOWN != `CT_DISK) + return false; + + return true; + } + + void HandleHdDiskOverviewTab(any user_data, map event) { string disk_device = (string) user_data; @@ -250,27 +283,19 @@ { case `smart: { - map<string, map> target_map = Storage::GetTargetMap(); - map disk = target_map[disk_device]:$[]; - if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") - { + if (!DiskMaySupportSmart(disk_device)) Popup::Error(_("SMART is not available for this disk.")); - break; - } - DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); + else + DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); break; } case `hdparm: { - map<string, map> target_map = Storage::GetTargetMap(); - map disk = target_map[disk_device]:$[]; - if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") - { + if (!DiskMaySupportHdparm(disk_device)) Popup::Error(_("hdparm is not available for this disk.")); - break; - } - DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); + else + DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); break; } } @@ -325,7 +350,7 @@ `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), `HBox( - ArrangeButtons(flatten([ + ArrangeButtons(flatten([ [ // push button text `PushButton(`id(`add),`opt(`key_F3), _("Add...")) ], HdButtons(), -- 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] r66360 - /tags/branch-Code-11-SP2-2_17_27/iscsi-client/
by fehr＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: fehr Date: Mon Oct 10 15:16:54 2011 New Revision: 66360 URL: http://svn.opensuse.org/viewcvs/yast?rev=66360&view=rev Log: Created tag branch-Code-11-SP2-2_17_27 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_27/iscsi-client/ (props changed) - copied from r66359, branches/SuSE-Code-11-SP2-Branch/iscsi-client/ -- 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] r66359 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: fehr Date: Mon Oct 10 15:16:42 2011 New Revision: 66359 URL: http://svn.opensuse.org/viewcvs/yast?rev=66359&view=rev Log: - 2.17.27 - add qla3xxx to modules supporting qla iscsi offload (bnc#723014) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Mon Oct 10 15:16:42 2011 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Mon Oct 10 15:16:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 10 15:13:28 CEST 2011 - fehr(a)suse.de + +- 2.17.27 +- add qla3xxx to modules supporting qla iscsi offload (bnc#723014) + +------------------------------------------------------------------- Thu Jul 28 12:17:34 CEST 2011 - fehr(a)suse.de - adapt to work with iscsi_offload script in open-iscsi Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Mon Oct 10 15:16:42 2011 @@ -642,7 +642,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "cnic", "fnic" ] ], - [ "qla4xxx", "qla4xxx", [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ] ] ]; -- 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] r66358 - in /branches/tmp/lslezak/dbus-server: ./ package/ src/liby2dbus/ src/liby2dbus/src/ src/services/ src/services/SCR_service/ src/services/namespace_service/ src/services/namespace_service/d...
by lslezak＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: lslezak Date: Mon Oct 10 15:06:59 2011 New Revision: 66358 URL: http://svn.opensuse.org/viewcvs/yast?rev=66358&view=rev Log: merged changes from Trunk (r60961 to r66357) Added: branches/tmp/lslezak/dbus-server/src/liby2dbus/src/search_path.h - copied unchanged from r66357, trunk/dbus-server/src/liby2dbus/src/search_path.h Modified: branches/tmp/lslezak/dbus-server/ (props changed) branches/tmp/lslezak/dbus-server/VERSION branches/tmp/lslezak/dbus-server/package/ (props changed) branches/tmp/lslezak/dbus-server/package/yast2-dbus-server.changes branches/tmp/lslezak/dbus-server/src/liby2dbus/ (props changed) branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusMsg.cc branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am branches/tmp/lslezak/dbus-server/src/services/Makefile.am (props changed) branches/tmp/lslezak/dbus-server/src/services/SCR_service/ (props changed) branches/tmp/lslezak/dbus-server/src/services/namespace_service/ (props changed) branches/tmp/lslezak/dbus-server/src/services/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (props changed) branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/t5-params.py branches/tmp/lslezak/dbus-server/yast2-dbus-server.spec.in Modified: branches/tmp/lslezak/dbus-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/VERSI… ============================================================================== --- branches/tmp/lslezak/dbus-server/VERSION (original) +++ branches/tmp/lslezak/dbus-server/VERSION Mon Oct 10 15:06:59 2011 @@ -1 +1 @@ -2.18.1 +2.21.0 Modified: branches/tmp/lslezak/dbus-server/package/yast2-dbus-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/packa… ============================================================================== --- branches/tmp/lslezak/dbus-server/package/yast2-dbus-server.changes (original) +++ branches/tmp/lslezak/dbus-server/package/yast2-dbus-server.changes Mon Oct 10 15:06:59 2011 @@ -1,4 +1,36 @@ ------------------------------------------------------------------- +Wed Jun 29 11:19:50 UTC 2011 - lslezak(a)suse.cz + +- properly distinguish between received empty map and empty list + (bnc#588593) +- reenable tests during build +- 2.21.0 + +------------------------------------------------------------------- +Mon Feb 7 14:49:13 UTC 2011 - lslezak(a)suse.cz + +- temporarily disable tests (see bnc#645381) + +------------------------------------------------------------------- +Mon Oct 11 13:54:01 CEST 2010 - mvidner(a)suse.cz + +- Build fix: python-2.7 moved unittest to python-devel + +------------------------------------------------------------------- +Thu Jul 15 11:05:35 UTC 2010 - lslezak(a)suse.cz + +- set PATH environment to the default if it's not set (bnc#617442) +- 2.20.0 + +------------------------------------------------------------------- +Wed May 19 16:14:05 CEST 2010 - mvidner(a)suse.cz + +- Better fix: dbus_bool_t instead of int (bnc#606712). +- Fixed retrieving boolean values on big-endian archs (bnc#606712). +- Enabled the already existing test for this bug. +- 2.18.2 + +------------------------------------------------------------------- Fri Sep 4 18:06:38 CEST 2009 - mvidner(a)suse.cz - don't use ldconfig as a shell in postun Modified: branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/l… ============================================================================== --- branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusMsg.cc Mon Oct 10 15:06:59 2011 @@ -386,8 +386,6 @@ DBusMessageIter array_it; - YCPMap::const_iterator mit = map.begin(); - std::string map_signature("{" + map_key_type + map_val_type + "}"); // open array container @@ -796,7 +794,7 @@ { if (type == DBUS_TYPE_BOOLEAN) { - bool b; + dbus_bool_t b; // not bool, bnc#606712 dbus_message_iter_get_basic(it, &b); ret = YCPBoolean(b); mismatch = false; @@ -967,7 +965,7 @@ // TODO support more types if (type == DBUS_TYPE_BOOLEAN) { - bool b; + dbus_bool_t b; // not bool, bnc#606712 dbus_message_iter_get_basic(it, &b); ret = YCPBoolean(b); } @@ -986,9 +984,12 @@ // DBUS_TYPE_ARRAY is used for YCPList and YCPMap y2debug("Reading RAW DBus array"); - // is the container a map or a list? - // An empty map is indistinguishable from a list! - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY) + // is the container a map or a list? => check the signature of the iterator + // hash signature starts with '{', examples: list signature: "s", map signature: "{sv}" + std::string cont_sig(dbus_message_iter_get_signature(&sub)); + y2debug("Container signature: %s", cont_sig.c_str()); + + if (!cont_sig.empty() && cont_sig[0] == '{') { y2debug("Found a map"); ret = getYCPValueMap(&sub, Type::Any, Type::Unspec); Modified: branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/l… ============================================================================== --- branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/dbus-server/src/liby2dbus/src/DBusServerBase.cc Mon Oct 10 15:06:59 2011 @@ -9,6 +9,7 @@ #include "DBusServerBase.h" #include "DBusMsg.h" +#include "search_path.h" #include <ycp/y2log.h> @@ -25,6 +26,9 @@ { test_mode = testmode; dbus_threads_init_default(); + + // set default PATH if not set + set_default_path(); } DBusServerBase::~DBusServerBase() @@ -141,7 +145,7 @@ // the time is over if (!timeout_counter) { - y2debug("Timout reached"); + y2debug("Timeout reached"); if (canFinish()) { Modified: branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/l… ============================================================================== --- branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am (original) +++ branches/tmp/lslezak/dbus-server/src/liby2dbus/src/Makefile.am Mon Oct 10 15:06:59 2011 @@ -8,7 +8,7 @@ liby2dbus_la_SOURCES = DBusMsg.cc DBusMsg.h DBusConn.cc DBusConn.h DBusCaller.cc DBusCaller.h \ DBusServerBase.cc DBusServerBase.h DBusSignature.cc DBusSignature.h \ - DBusArgument.cc DBusArgument.h + DBusArgument.cc DBusArgument.h search_path.h if HAVE_POLKIT liby2dbus_la_SOURCES += PolKit.cc PolKit.h endif Modified: branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/t5-params.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/src/s… ============================================================================== --- branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/t5-params.py (original) +++ branches/tmp/lslezak/dbus-server/src/services/namespace_service/testsuite/t5-params.py Mon Oct 10 15:06:59 2011 @@ -78,6 +78,18 @@ lst = [1, 2, 3] self.assertEqual(self.T.ParamList(lst), lst) + # test sending/receivng a map, test also empty map and list (bnc#588593) + def testMap(self): + map = { + "string" : True, + "list" : ["a", "b", "c"], + "map" : { "key" : "value"}, + # python cannot guess signature for empty containers, set it explicitly + "empty_list" : dbus.Array([], "s"), + "empty_map" : dbus.Dictionary({}, "sv") + } + self.assertEqual(self.T.ParamMap(map), map) + #Term is not exported # def testTerm(self): # term = ["name", "two", "three"] Modified: branches/tmp/lslezak/dbus-server/yast2-dbus-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/dbus-server/yast2… ============================================================================== --- branches/tmp/lslezak/dbus-server/yast2-dbus-server.spec.in (original) +++ branches/tmp/lslezak/dbus-server/yast2-dbus-server.spec.in Mon Oct 10 15:06:59 2011 @@ -3,7 +3,8 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ +Url: http://en.opensuse.org/Portal:YaST # obviously BuildRequires: gcc-c++ # needed for all yast packages @@ -19,6 +20,8 @@ # for SCR DBus service BuildRequires: dbus-1-devel dbus-1-x11 polkit-devel libxcrypt-devel +# its tests +BuildRequires: dbus-1-python python-devel Summary: YaST2 - DBus Server -- 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] r66357 - /tags/stable-2_21_13/snapper/
by jsuchome＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: jsuchome Date: Mon Oct 10 12:54:20 2011 New Revision: 66357 URL: http://svn.opensuse.org/viewcvs/yast?rev=66357&view=rev Log: Created tag stable-2_21_13 for snapper Added: tags/stable-2_21_13/snapper/ - copied from r66356, trunk/snapper/ -- 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] r66356 - in /trunk/snapper: ./ agent-snapper/src/ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: jsuchome Date: Mon Oct 10 12:54:07 2011 New Revision: 66356 URL: http://svn.opensuse.org/viewcvs/yast?rev=66356&view=rev Log: - agent: pass map refereces as arguments - quote strings passed to bash commands - fixed testsuite - 2.21.13 Modified: trunk/snapper/VERSION trunk/snapper/agent-snapper/src/SnapperAgent.cc trunk/snapper/agent-snapper/src/SnapperAgent.h trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/Snapper.ycp trunk/snapper/src/dialogs.ycp trunk/snapper/testsuite/tests/GetFileMode.out trunk/snapper/testsuite/tests/GetFileModification.out Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=66356&r1=663… ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Mon Oct 10 12:54:07 2011 @@ -1 +1 @@ -2.21.12 +2.21.13 Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.cc Mon Oct 10 12:54:07 2011 @@ -18,7 +18,7 @@ /* * search the map for value of given key; both key and value have to be strings */ -string SnapperAgent::getValue (const YCPMap map, const string key, string deflt) +string SnapperAgent::getValue (const YCPMap &map, const string key, const string deflt) { if (!map->value(YCPString(key)).isNull() && map->value(YCPString(key))->isString()) @@ -33,7 +33,7 @@ * @param key key we are looking for * @param deflt the default value to be returned if key is not found */ -int SnapperAgent::getIntValue (const YCPMap map, const string key, int deflt) +int SnapperAgent::getIntValue (const YCPMap &map, const string key, const int deflt) { if (!map->value(YCPString(key)).isNull() && map->value(YCPString(key))->isInteger()) { return map->value(YCPString(key))->asInteger()->value(); @@ -50,7 +50,7 @@ * Search the map for value of given key; * key is string and value is YCPList */ -YCPList SnapperAgent::getListValue (const YCPMap map, const string key) +YCPList SnapperAgent::getListValue (const YCPMap &map, const string key) { if (!map->value(YCPString(key)).isNull() && map->value(YCPString(key))->isList()) return map->value(YCPString(key))->asList(); Modified: trunk/snapper/agent-snapper/src/SnapperAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.h (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.h Mon Oct 10 12:54:07 2011 @@ -37,7 +37,7 @@ * search the map for value of given key; both key and value have to be strings * when key is not present, default value is returned */ - string getValue (const YCPMap map, const string key, string deflt); + string getValue (const YCPMap &map, const string key, const string deflt); /** * Search the map for value of given key @@ -45,13 +45,13 @@ * @param key key we are looking for * @param deflt the default value to be returned if key is not found */ - int getIntValue ( const YCPMap map, const string key, int deflt); + int getIntValue ( const YCPMap &map, const string key, const int deflt); /** * Search the map for value of given key; * key is string and value is YCPList */ - YCPList getListValue (const YCPMap map, const string key); + YCPList getListValue (const YCPMap &map, const string key); public: /** Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.ch… ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Mon Oct 10 12:54:07 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 10 12:44:44 CEST 2011 - jsuchome(a)suse.cz + +- agent: pass map refereces as arguments +- quote strings passed to bash commands +- fixed testsuite +- 2.21.13 + +------------------------------------------------------------------- Fri Oct 7 14:36:51 CEST 2011 - jsuchome(a)suse.cz - removed conflicting statusToString Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=6635… ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Mon Oct 10 12:54:07 2011 @@ -38,7 +38,7 @@ import "Label"; import "Progress"; import "Report"; - +import "String"; // global list of all snapshot global list<map> snapshots = []; @@ -116,7 +116,7 @@ { list<string> status = [ "no_change" ]; map out = (map) SCR::Execute (.target.bash_output, - sformat ("/usr/bin/diff -u %1 %2", file1, file2)); + sformat ("/usr/bin/diff -u '%1' '%2'", String::Quote (file1), String::Quote (file2))); if (out["stderr"]:"" != "") { y2warning ("out: %1", out); @@ -131,7 +131,8 @@ // check mode and ownerships out = (map) SCR::Execute (.target.bash_output, - sformat ("ls -ld %1 %2 | cut -f 1,3,4 -d ' '", file1, file2)); + sformat ("ls -ld -- '%1' '%2' | cut -f 1,3,4 -d ' '", + String::Quote (file1), String::Quote (file2))); list<string> parts = splitstring (out["stdout"]:""," \n"); if (parts[0]:"" != parts[3]:"") @@ -284,8 +285,12 @@ */ integer GetFileMode (string file) { - map out = (map) SCR::Execute (.target.bash_output, "/bin/stat --printf=%a " + file); - return tointeger (out["stdout"]:"755"); + map out = (map) SCR::Execute (.target.bash_output, + sformat ("/bin/stat --printf=%%a '%1'", String::Quote (file))); + string mode = out["stdout"]:""; + if (mode == nil || mode == "") + return 644; + return tointeger (mode); } /** @@ -332,12 +337,15 @@ { SCR::Execute (.target.mkdir, full_path); } - SCR::Execute (.target.bash, sformat ("/bin/chown %1:%2 '%3'", stat["uid"]:0, stat["gid"]:0, full_path)); - SCR::Execute (.target.bash, sformat ("/bin/chmod %1 '%2'", GetFileMode (orig), full_path)); + SCR::Execute (.target.bash, sformat ("/bin/chown -- %1:%2 '%3'", + stat["uid"]:0, stat["gid"]:0, String::Quote (full_path))); + SCR::Execute (.target.bash, sformat ("/bin/chmod -- %1 '%2'", + GetFileMode (orig), String::Quote (full_path))); } else { - SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2'", orig, full_path)); + SCR::Execute (.target.bash, sformat ("/bin/cp -a -- '%1' '%2'", + String::Quote (orig), String::Quote (full_path))); } UI::ChangeWidget (`id (`log), `LastLine, full_path + "\n"); } Modified: trunk/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/dialogs.ycp?rev=6635… ============================================================================== --- trunk/snapper/src/dialogs.ycp (original) +++ trunk/snapper/src/dialogs.ycp Mon Oct 10 12:54:07 2011 @@ -37,6 +37,7 @@ import "Popup"; import "Wizard"; import "Snapper"; +import "String"; include "snapper/helps.ycp"; @@ -636,7 +637,7 @@ files = filter (string file, files, { if (haskey (files_index, file)) { - to_restore = add (to_restore, Snapper::GetFileFullPath (file)); + to_restore = add (to_restore, String::Quote (Snapper::GetFileFullPath (file))); return true; } else Modified: trunk/snapper/testsuite/tests/GetFileMode.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/testsuite/tests/GetFileM… ============================================================================== --- trunk/snapper/testsuite/tests/GetFileMode.out (original) +++ trunk/snapper/testsuite/tests/GetFileMode.out Mon Oct 10 12:54:07 2011 @@ -1,4 +1,4 @@ -Execute .target.bash_output "/bin/stat --printf=%a /tmp/1" $["stdout":"755"] +Execute .target.bash_output "/bin/stat --printf=%a '/tmp/1'" $["stdout":"755"] Return 755 -Execute .target.bash_output "/bin/stat --printf=%a /tmp/2" $["stderr":"/bin/stat: cannot stat `/tmp/2': No such file or directory\n", "stdout":""] +Execute .target.bash_output "/bin/stat --printf=%a '/tmp/2'" $["stderr":"/bin/stat: cannot stat `/tmp/2': No such file or directory\n", "stdout":""] Return 644 Modified: trunk/snapper/testsuite/tests/GetFileModification.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/testsuite/tests/GetFileM… ============================================================================== --- trunk/snapper/testsuite/tests/GetFileModification.out (original) +++ trunk/snapper/testsuite/tests/GetFileModification.out Mon Oct 10 12:54:07 2011 @@ -1,12 +1,13 @@ Read .snapper.path $["num":1] "/snapshots/1/snapshot" -Execute .target.bash_output "/usr/bin/diff -u /snapshots/1/snapshot/etc/passwd /etc/passwd" $["stderr":"error while diffing"] +Read .snapper.path $["num":0] "/snapshots/1/snapshot" +Execute .target.bash_output "/usr/bin/diff -u '/snapshots/1/snapshot/etc/passwd' '/etc/passwd'" $["stderr":"error while diffing"] Log out: $["stderr":"error while diffing"] -Execute .target.bash_output "ls -ld /snapshots/1/snapshot/etc/passwd /etc/passwd | cut -f 1,3,4 -d ' '" $["stderr":"error while diffing"] +Execute .target.bash_output "ls -ld -- '/snapshots/1/snapshot/etc/passwd' '/etc/passwd' | cut -f 1,3,4 -d ' '" $["stderr":"error while diffing"] Return $["diff":"error while diffing", "status":["no_change"]] Read .snapper.path $["num":1] "/snapshots/1/snapshot" Read .snapper.path $["num":2] "/snapshots/1/snapshot" -Execute .target.bash_output "/usr/bin/diff -u /snapshots/1/snapshot/etc/passwd /snapshots/1/snapshot/etc/passwd" $["stdout":"+new user line"] -Execute .target.bash_output "ls -ld /snapshots/1/snapshot/etc/passwd /snapshots/1/snapshot/etc/passwd | cut -f 1,3,4 -d ' '" $["stdout":"+new user line"] +Execute .target.bash_output "/usr/bin/diff -u '/snapshots/1/snapshot/etc/passwd' '/snapshots/1/snapshot/etc/passwd'" $["stdout":"+new user line"] +Execute .target.bash_output "ls -ld -- '/snapshots/1/snapshot/etc/passwd' '/snapshots/1/snapshot/etc/passwd' | cut -f 1,3,4 -d ' '" $["stdout":"+new user line"] Return $["diff":"+new user line", "group1":"line", "group2":"", "mode1":"+new", "mode2":"", "status":["diff", "mode", "user", "group"], "user1":"user", "user2":""] Read .snapper.path $["num":1] "/snapshots/1/snapshot" Read .snapper.path $["num":2] "/snapshots/1/snapshot" -- 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] r66355 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoinstPartPlan.ycp
by ug＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: ug Date: Mon Oct 10 11:23:34 2011 New Revision: 66355 URL: http://svn.opensuse.org/viewcvs/yast?rev=66355&view=rev Log: cloning of LVM did not clone the VG name for a physical partition (bnc#720771) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION Mon Oct 10 11:23:34 2011 @@ -1 +1 @@ -2.17.52 +2.17.53 Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Mon Oct 10 11:23:34 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 10 11:18:02 CEST 2011 - ug(a)suse.de + +- cloning of LVM did not clone the VG name for a physical + partition (bnc#720771) +- 2.17.53 + +------------------------------------------------------------------- Wed Oct 5 10:57:39 UTC 2011 - jsrain@site - prevent unwanted change of autoupgrade mode to autoinstallation Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp Mon Oct 10 11:23:34 2011 @@ -433,7 +433,7 @@ // LVM Group if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_LVM) { - new_pe["lvm_group"] = pe["used_by"]:""; + new_pe["lvm_group"] = substring( pe["used_by_device"]:"", 5 ); } // LV -- 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] r66354 - /tags/branch-Code-11-SP2-2_17_23/s390/
by thardeck＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: thardeck Date: Mon Oct 10 11:14:47 2011 New Revision: 66354 URL: http://svn.opensuse.org/viewcvs/yast?rev=66354&view=rev Log: Created tag branch-Code-11-SP2-2_17_23 for s390 Added: tags/branch-Code-11-SP2-2_17_23/s390/ (props changed) - copied from r66353, branches/SuSE-Code-11-SP2-Branch/s390/ -- 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] r66353 - in /branches/SuSE-Code-11-SP2-Branch/s390: ./ package/ src/dump/ src/iucvterminal-server/ src/iucvterminal/ src/modules/ src/onpanic/
by thardeck＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: thardeck Date: Mon Oct 10 11:14:23 2011 New Revision: 66353 URL: http://svn.opensuse.org/viewcvs/yast?rev=66353&view=rev Log: - fixed translation (bnc#722447) - removed workaround for (bnc#718089) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Mon Oct 10 11:14:23 2011 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Mon Oct 10 11:14:23 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 10 10:55:11 UTC 2011 - thardeck(a)suse.com + +- fixed translation (bnc#722447) +- removed workaround for (bnc#718089) + +------------------------------------------------------------------- Wed Sep 07 16:15:24 UTC 2011 - thardeck(a)suse.com - added IUCV Terminal module Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/dump/ui.ycp Mon Oct 10 11:14:23 2011 @@ -123,8 +123,10 @@ } else { + // count devices for proper grammatical number output + integer num_devices = size(splitstring(device," ")); // warn only in case of force - if (!force || Popup::YesNo (sformat (_("The disk[s] %1 will be formatted as a dump device. All data on this device[s] will be lost! Continue?"), device))) + if (!force || Popup::YesNo (sformat (_("The disk %1 will be formatted as a dump device. All data on this device will be lost! Continue?", "The disks %1 will be formatted as a dump device. All data on these devices will be lost! Continue?", num_devices), device))) { boolean success = Dump::FormatDisk (device, force); // don't quit in case of failures, error messages are reported by FormatDisk() Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/helps.ycp Mon Oct 10 11:14:23 2011 @@ -32,7 +32,7 @@ + _("To add or remove groups from the TS-Shell authorization table or to change the membership of them Manage Groups has to be called.") -+ _("With Audited IDs the z/VM IDs could be specified from which transrcripts should be gathered."), ++ _("With Audited IDs the z/VM IDs could be specified from which transcripts should be gathered."), /* TS-Shell User creation dialog */ Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal-server/ui.ycp Mon Oct 10 11:14:23 2011 @@ -648,7 +648,7 @@ void DrawTsUserDialog() { Wizard::SetContentsButtons(_("New TS-Shell User"), TsUserDialogContent(), - HELP["ts-user"]:"", Label::BackButton (), Label::OKButton ()); + HELP["ts-user"]:"", Label::BackButton (), Label::CreateButton ()); Wizard::SetAbortButton(`abort, Label::CancelButton()); } Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/iucvterminal/ui.ycp Mon Oct 10 11:14:23 2011 @@ -220,8 +220,8 @@ string caption = "Configure IUCV Terminal Settings"; string help = _("<h2>Configure Local Terminal System Settings</h2>") + _("IUVCtty") -+ _("Several IUCVtty instances can run to provide multiple terminal devices. The instances are distinguished by a Terminal ID that consist of the Terminal ID Prefix and the number of the instance. ") -+ _("So if for example 10 instances are defined with the prefix "lxterm" Terminal IDs from lxterm1 to lxterm10 would be available.") ++ _("Several IUCVtty instances can run to provide multiple terminal devices. The instances are distinguished by a Terminal ID which is a combination of the the Terminal ID Prefix and the number of the instance. ") ++ _("So if for example 10 instances are defined with the prefix "lxterm" the Terminal IDs from lxterm1 to lxterm10 would be available.") + " " + _("HVC") + _("The z/VM IUCV HVC device driver is a kernel module and uses device nodes to enable up to 8 HVC terminal devices to communicate with getty and login programs.") @@ -349,7 +349,7 @@ || IUCVTerminal::restrict_hvc_to_srvs != (string)UI::QueryWidget (`id (`restrict_hvc_to_srvs), `Value) || (IUCVTerminal::restrict_hvc_to_srvs != "" && !(boolean)UI::QueryWidget (`id (`is_hvc_restricted), `Value)) - || (IUCVTerminal::hvc_instances != 0 && HasEmulationChanged()) + || (HasEmulationChanged() && (boolean)UI::QueryWidget (`id (`hvc), `Value)) ); // if settings were changed don't exit without asking @@ -399,9 +399,7 @@ : ""; // check if the bootloader settings need to be adjusted IUCVTerminal::has_bootloader_changed = - // one HVC device is allowed by default so no extra Kernel parameter is needed - ((IUCVTerminal::hvc_instances != current_hvc_instances && ((current_hvc_instances + IUCVTerminal::hvc_instances) > 2)) - || IUCVTerminal::restrict_hvc_to_srvs != current_restrict_hvc_to_srvs + ( IUCVTerminal::restrict_hvc_to_srvs != current_restrict_hvc_to_srvs || IUCVTerminal::show_kernel_out_on_hvc != (boolean) UI::QueryWidget (`id (`show_kernel_out_on_hvc), `Value)); if (IUCVTerminal::has_bootloader_changed) @@ -441,7 +439,7 @@ symbol IUCVTerminalSequence() { symbol ret = nil; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("dump"); + Wizard::SetDesktopIcon("iucvterminal"); IUCVTerminal::Read (); ret = TerminalDialog (); // only write during Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/Dump.ycp Mon Oct 10 11:14:23 2011 @@ -80,15 +80,15 @@ * @return boolean true on success */ global define boolean FormatDisk (string dev, boolean force) { - string caption = _("Creating Dump Device[s]"); + string caption = _("Creating Dump Device"); integer steps = 1; Progress::New (caption, " ", steps, [ /* Progress stage 1/1 */ - _("Creating dump device[s]") + _("Creating dump device") ], [ /* Progress step 1/1 */ - _("Creating dump device[s]. This process might take some minutes."), + _("Creating dump device. This process might take some minutes."), /* Progress finished */ _("Finished") ], Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/IUCVTerminal.ycp Mon Oct 10 11:14:23 2011 @@ -200,12 +200,6 @@ restrict_hvc_to_srvs = restrict_hvc_to_srvs_output; } - string hvc_instances_output = Bootloader::getKernelParam (actual_boot_section, "hvc_iucv"); - if (hvc_instances_output != "false") - { - hvc_instances = tointeger(hvc_instances_output); - } - string console = Bootloader::getKernelParam (actual_boot_section, "console"); // if console is defined if (console != "false") @@ -325,21 +319,10 @@ // writing Kernel parameters Progress::NextStage(); + string actual_boot_section = Bootloader::getDefaultSection (); // only change/save the bootloader configuration if it was adjusted if (has_bootloader_changed) { - string actual_boot_section = Bootloader::getDefaultSection (); - // one hvc device is activated by default so no kernel parameter needed in this case - if (hvc_instances > 1) - { - Bootloader::setKernelParam (actual_boot_section, "hvc_iucv", tostring(hvc_instances)); - } - else - { - // remove entry - Bootloader::setKernelParam (actual_boot_section, "hvc_iucv", "false"); - } - // removing empty option if (restrict_hvc_to_srvs == "") { Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/onpanic/ui.ycp Mon Oct 10 11:14:23 2011 @@ -88,7 +88,7 @@ // For translators: Caption of the dialog string caption = _("On Panic Configuration"); - string help = _("Configure the action[s] to be taken if a kernel panic occurs") + string help = _("Configure the actions to be taken if a kernel panic occurs") + _("The Dumpconf daemon needs to be enabled to influence the behavior during kernel panics.") + _("The following Panic Actions are possible: ") + _("stop Stop Linux (default). ") -- 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] r66352 - /tags/stable-2_21_6/security/
by jsuchome＠svn2.opensuse.org 10 Oct '11

10 Oct '11

Author: jsuchome Date: Mon Oct 10 09:42:03 2011 New Revision: 66352 URL: http://svn.opensuse.org/viewcvs/yast?rev=66352&view=rev Log: Created tag stable-2_21_6 for security Added: tags/stable-2_21_6/security/ - copied from r66351, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0