February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55225 - in /trunk/bootloader: package/yast2-bootloader.changes src/generic/sections_widget.ycp src/modules/BootCommon.ycp src/modules/BootELILO.ycp src/modules/BootPOWERLILO.ycp src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: juhliarik Date: Wed Feb 4 12:19:32 2009 New Revision: 55225 URL: http://svn.opensuse.org/viewcvs/yast?rev=55225&view=rev Log: synchronize with branch Code11 and added fix for finding the smallest (boot) partition for pmac Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/generic/sections_widget.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Feb 4 12:19:32 2009 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Feb 4 12:15:21 CET 2008 - juhliarik(a)suse.cz + +- added fix for finding the smallest partition on pmac machine + (bnc #459860) +- updated function Dev2MountByDev() which can run long time if + machine included huge number of disks (bnc #468922) +- added fix for problem with adding boot entry to EFI if + installation run on different disk but with same boot partition + (bnc #450682) +- added fix for using translated text in bootloader e.g. Image, + Other (bug #445999) +- 2.18.0 + +------------------------------------------------------------------- Tue Jan 20 14:11:38 CET 2009 - juhliarik(a)suse.cz - added fix for problem with calling parted each time when Modified: trunk/bootloader/src/generic/sections_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/sections_… ============================================================================== --- trunk/bootloader/src/generic/sections_widget.ycp (original) +++ trunk/bootloader/src/generic/sections_widget.ycp Wed Feb 4 12:19:32 2009 @@ -81,13 +81,13 @@ ), ", " ); - // Upcase word 'type' - type = toupper(substring(type,0,1)) + substring(type,1); return `item (`id (name), BootCommon::globals["default"]:"" == name ? UI::Glyph (`CheckMark) : "", name, - type, + (type == "image") + ? _("Image") + : _("Other"), summary ); }); Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Wed Feb 4 12:19:32 2009 @@ -56,6 +56,14 @@ */ global map<string,any> exports = $[]; + +/** + * boolean value indicate if "/" is on logical + * and primary /boot doesn't exist + */ + +global boolean boot_device_on_logical = false; + /** * map of global options and values */ @@ -73,6 +81,14 @@ global integer cached_settings_base_data_change_time = nil; /** + * Saved change time from target map - only for MapAllPartitions() + */ + +global integer saved_last_change_time_from_storage = nil; + + + +/** * device mapping between Linux and firmware */ global map<string,string> device_mapping = $[]; @@ -363,6 +379,20 @@ +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> the map of all partitions with info about it -> + * necessary for Dev2MountByDev() in routines/misc.ycp + */ +global map<string,map> all_partitions = $[]; + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> target map try to minimalize calling Storage::GetTargetMap() + * + */ +map<string,map> target_map = $[]; + global define string getLoaderType (boolean recheck); global define list<string> getBootloaders (); global define list<string> Summary (); Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO… ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Wed Feb 4 12:19:32 2009 @@ -65,6 +65,13 @@ string efi_vendor = "SuSE"; /** + * bnc #450682 - adding boot entry to EFI + * true is label was added + */ + +global boolean added_label_to_efi = false; + +/** * Is the /sys/firmware/efi directory available? */ boolean efi_available = true; @@ -450,6 +457,9 @@ // error popup - label, %1 is bootloader name _("Error Occurred while Installing %1"), BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)), log); + } else { + added_label_to_efi = true; + y2milestone("Adding label to EFI finish successful"); } return ret; } @@ -566,13 +576,51 @@ return ret; } +/** FIXME: efibootmgr doesn't provide info about disk! + * bnc #450682 - adding boot entry to EFI + * function delete all existing boot entry with same name and partition number + * @param string name of label + * @param string number of partition + */ + +void deleteSameEFIBootEntry(string name, any part_no) +{ + boolean still_exist = true; + + string cmd = sformat("efibootmgr -v |grep \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\" | cut -d \" \" -f 1", + name, tomyhexa(part_no)); + y2milestone("run command %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone("output of command %1", out); + + string boot_entries = out["stdout"]:""; + y2milestone("EFI boot entries with \"same\" boot partition %1",boot_entries); + + list<string> list_boot_entries = splitstring(boot_entries, "\n"); + + y2milestone("list_boot_entries=%1",list_boot_entries); + + foreach(string entry, list_boot_entries, + { + if ((deletechars(entry, "\n*") != "") && (deletechars(entry, "\n*") != nil)) + { + cmd = sformat("/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;", + substring (deletechars(entry, "\n*"),4, 4)); + y2milestone("run command %1", cmd); + out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone("output of command %1", out); + } + }); +} /** * Write bootloader settings to disk * @return boolean true on success */ global define boolean Write () { + + y2milestone("run Write function from BootELILO"); // SCR::Execute (.target.bash, "/sbin/elilo"); boolean ret = BootCommon::UpdateBootloader (); if (ret == nil) @@ -621,10 +669,23 @@ // check number of same boot entries in efi // if boot entry is added -> don't add it again if (deletechars(out["stdout"]:"","\n") == "0") + { ret = ret && installBootLoader (bl_command, bl_logfile); - else - y2milestone("Skip adding boot entry: %1 to EFI. There already exist: %2 with same label and partition.", - BootCommon::globals["boot_efilabel"]:"", deletechars(out["stdout"]:"","\n")); + } else { + + if (added_label_to_efi) + { + y2milestone("Skip adding boot entry: %1 to EFI. There already exist and was added: %2 with + same label and partition.", BootCommon::globals["boot_efilabel"]:"", + deletechars(out["stdout"]:"","\n")); + } else { + // delete efi entry with same label name and partition + deleteSameEFIBootEntry(BootCommon::globals["boot_efilabel"]:"", boot_part); + // add new efi boot entry + ret = ret && installBootLoader (bl_command, bl_logfile); + } + + } } Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWER… ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Wed Feb 4 12:19:32 2009 @@ -503,15 +503,41 @@ // both partition types Apple_Bootstrap and Apple_HFS can be // handled by PPC lilo; yast2-storage maps both to fsid 258 && (p["fsid"]:nil == 258) - // the partition should be smaller than 20 cylinders (PPC lilo - // takes that size as well); estimating the kiBytes: - // 255 heads * 63 sectors * 20 cylinders * 512 bytes / 1024 bytes = - // 160650 kiBytes - && (p["size_k"]:0 < 160650) && !contains( [`lvm, `evms, `sw_raid], p["type"]:`primary ) )); y2milestone ("Filtered existing partitions: %1", partitions); + // bug #459860 - no boot partition found during fresh install + // find the smallest partition + integer max_size = 1000000000; + integer iter = -1; + integer min_position = -1; + foreach (map p, partitions, + { + iter = iter +1; + if (p["size_k"]:0 < max_size) + { + min_position = iter; + max_size = p["size_k"]:0; + } + }); + + // if any partition was found + if (min_position > -1) + { + list <map> tmp_partitions = []; + map partition = partitions[min_position]:$[]; + if (partition["size_k"]:0 < 160650) + y2milestone("Partition smaller than 160650k: %1", partition); + else + y2warning("Partition is not smaller than 160650k: %1", partition); + tmp_partitions = add(tmp_partitions, partition); + partitions = tmp_partitions; + } + + y2milestone ("Filtered existing partitions: %1", partitions); + + // found a boot partition on the same device as the root partition? if (hasrootdev && size (partitions) > 0 && selected_boot_partition == "") Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Wed Feb 4 12:19:32 2009 @@ -574,6 +574,38 @@ return temp_sec; } +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * Function initialize BootCommon::all_partitions only if storage change + * partitioning of disk + * true if init all_partitions + */ + +boolean MapAllPartitions() +{ + boolean ret = false; + if (saved_last_change_time_from_storage != Storage::GetTargetChangeTime()) + { + // save last change time from storage for MapAllPartitions() + saved_last_change_time_from_storage = Storage::GetTargetChangeTime(); + + BootCommon::all_partitions = $[]; + BootCommon::target_map = $[]; + // get target map + BootCommon::target_map = (map<string,map>)Storage::GetTargetMap(); + // map all partitions + foreach (string k, map v, BootCommon::target_map, + { + foreach (map p, (list<map>)(v["partitions"]:[]), + { + all_partitions[p["device"]:""] = p; + }); + }); + ret = true; + } + + return ret; +} /** FATE #302219 - Use and choose persistent device names for disk devices * Converts a device name to the corresponding device name it should be @@ -599,18 +631,13 @@ //by_mount = `id; y2milestone("Default mount by is %1", by_mount); - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - - // make a map: "/dev/hda1" -> info_map_for_this_partition - map<string,map> partitions = $[]; - foreach (string k, map v, devices, - { - foreach (map p, (list<map>)(v["partitions"]:[]), - { - partitions[p["device"]:""] = p; - }); - }); + // add all_partitions to partitions + if (MapAllPartitions()) + y2milestone("Init BootCommon::all_partitions was done"); + map<string,map> partitions = BootCommon::all_partitions; + map<string,map> devices = BootCommon::target_map; + string ret = dev; switch(by_mount) { -- 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] r55224 - /trunk/nfs-server/src/ui.ycp
by mvidner＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: mvidner Date: Wed Feb 4 10:58:24 2009 New Revision: 55224 URL: http://svn.opensuse.org/viewcvs/yast?rev=55224&view=rev Log: Sex sells, this is a better example. Modified: trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=55224&… ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Wed Feb 4 10:58:24 2009 @@ -516,10 +516,10 @@ // Watch out, the space is necessary between br and slash. help_text = help_text + _("In case of multiple exports to a NFSv4 client, you need to bind the exported paths with no fsid=0 to the one with fsid=0. -To export the server paths <tt>/data</tt> and <tt>/data2</tt> as -<tt>/</tt> and <tt>/more</tt>, respectively, use -<pre>/data 10.0.0.1(fsid=0,crossmnt,ro,...) -/data/more 10.0.0.1(bind=/data2,ro,...)</pre> +To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as +<tt>/</tt> and <tt>/husband</tt>, respectively, use +<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...) +/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre> "); } -- 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] r55223 - /branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc
by lslezak＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: lslezak Date: Wed Feb 4 10:49:25 2009 New Revision: 55223 URL: http://svn.opensuse.org/viewcvs/yast?rev=55223&view=rev Log: - added new lines to introspection data (better human readable output) Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Wed Feb 4 10:49:25 2009 @@ -184,34 +184,34 @@ introspect = // introcpection data for the root node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE - "<node>" - " <interface name='org.freedesktop.DBus.Introspectable'>" - " <method name='Introspect'>" - " <arg name='xml_data' type='s' direction='out'/>" - " </method>" - " </interface>"; + "\n<node>\n" + " <interface name='org.freedesktop.DBus.Introspectable'>\n" + " <method name='Introspect'>\n" + " <arg name='xml_data' type='s' direction='out'/>\n" + " </method>\n" + " </interface>\n"; for(Objects::const_iterator i = registered_objects.begin(); i != registered_objects.end(); ++i) { - introspect += " <node name='" + i->first + "'/>"; + introspect += " <node name='" + i->first + "'/>\n"; } // close the node section - introspect += "</node>"; + introspect += "</node>\n"; } else { introspect = // introcpection data for the root node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE - "<node>" - " <interface name='org.freedesktop.DBus.Introspectable'>" - " <method name='Introspect'>" - " <arg name='xml_data' type='s' direction='out'/>" - " </method>" - " </interface>"; + "\n<node>\n" + " <interface name='org.freedesktop.DBus.Introspectable'>\n" + " <method name='Introspect'>\n" + " <arg name='xml_data' type='s' direction='out'/>\n" + " </method>\n" + " </interface>\n"; std::string objname = request.path(); @@ -237,7 +237,7 @@ ii != od.end(); ++ii) { - introspect += " <interface name='" + ii->first + "'>"; + introspect += " <interface name='" + ii->first + "'>\n"; InterfaceData id = ii->second; @@ -255,15 +255,15 @@ // add somthing like "<arg name='xml_data' type='s' direction='out'/>" introspect += sig.asXML(); - introspect += " </method>"; + introspect += "</method>\n"; } - introspect += " </interface>"; + introspect += " </interface>\n"; } } - introspect += " </node>"; + introspect += " </node>\n"; } // create a reply to the request -- 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] r55222 - /branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc
by lslezak＠svn.opensuse.org 04 Feb '09

04 Feb '09

Author: lslezak Date: Wed Feb 4 10:28:44 2009 New Revision: 55222 URL: http://svn.opensuse.org/viewcvs/yast?rev=55222&view=rev Log: - fixed YCPMap -> DBus array conversion (DBus allows only basic types as the key) Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Wed Feb 4 10:28:44 2009 @@ -311,47 +311,68 @@ DBusMessageIter array_it; + YCPMapIterator mit = map.begin(); + // use string as fallback for empty map + std::string key_type(mit == map.end() ? "s" : typeStr(mit.key())); + + // dbus allows only basic types as key type in a map + const std::string valid_key_types(DBUS_TYPE_INT64_AS_STRING DBUS_TYPE_DOUBLE_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_BOOLEAN_AS_STRING); + + if (valid_key_types.find(key_type) == std::string::npos) + { + y2error("Invalid type of key in map (non-basic type): %s, ignoring the map", key_type.c_str()); + return false; + } + + std::string map_signature("{" + key_type + "v}"); + // open array container y2debug("Opening DICT container"); - dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "{vv}", &array_it); + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, map_signature.c_str(), &array_it); for(YCPMapIterator mit = map.begin(); mit != map.end() ; ++mit) { YCPValue key = mit.key(); YCPValue val = mit.value(); + // error: this is a different key type than the announced type + if (key_type != typeStr(key)) + { + y2error("Found different key type %s (expected %s) - ignoring pair $[ %s : %s ]", + typeStr(key), key_type.c_str(), + key->toString().c_str(), val->toString().c_str()); + + continue; + } + DBusMessageIter map_item_it; y2debug("Opening map item container"); dbus_message_iter_open_container(&array_it, DBUS_TYPE_DICT_ENTRY, 0, &map_item_it); - // add VARIANT container - DBusMessageIter var_it; - dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(key), &var_it); - // add the key - addValueAt(key, &var_it); - - y2debug("Closing VARIANT container"); - dbus_message_iter_close_container(&array_it, &var_it); - + addValueAt(key, &map_item_it); // add VARIANT container DBusMessageIter var_it2; - dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(val), &var_it2); + y2debug("Opening VARIANT container with type %s", typeStr(val)); + dbus_message_iter_open_container(&map_item_it, DBUS_TYPE_VARIANT, typeStr(val), &var_it2); // add the key addValueAt(val, &var_it2); y2debug("Closing VARIANT container"); - dbus_message_iter_close_container(&array_it, &var_it2); + dbus_message_iter_close_container(&map_item_it, &var_it2); // close map item dbus_message_iter_close_container(&array_it, &map_item_it); + y2debug("Closing map item container"); } // close array container dbus_message_iter_close_container(i, &array_it); + y2debug("Closing DICT container"); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55221 - in /trunk/storage: libstorage/src/Graph.cc libstorage/src/Graph.h storage/src/include/ep-graph.ycp storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: aschnell Date: Tue Feb 3 20:48:39 2009 New Revision: 55221 URL: http://svn.opensuse.org/viewcvs/yast?rev=55221&view=rev Log: - added some error handling for graph saving Modified: trunk/storage/libstorage/src/Graph.cc trunk/storage/libstorage/src/Graph.h trunk/storage/storage/src/include/ep-graph.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue Feb 3 20:48:39 2009 @@ -69,7 +69,7 @@ } - int + bool saveGraph(StorageInterface* s, const string& filename) { list<Node> nodes; @@ -211,8 +211,7 @@ out.close(); - - return 0; + return !out.bad(); } } Modified: trunk/storage/libstorage/src/Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.h?r… ============================================================================== --- trunk/storage/libstorage/src/Graph.h (original) +++ trunk/storage/libstorage/src/Graph.h Tue Feb 3 20:48:39 2009 @@ -4,7 +4,6 @@ #include <string> - #include "StorageInterface.h" @@ -14,10 +13,11 @@ /** * Saves a graph of the storage devices as a DOT file for graphviz. * + * @param s StorageInterface * @param filename filename of graph - * @return zero if all is ok, negative number to indicate an error + * @return true on successful writing of graph */ - int saveGraph(StorageInterface* s, const std::string& filename); + bool saveGraph(StorageInterface* s, const std::string& filename); } Modified: trunk/storage/storage/src/include/ep-graph.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-g… ============================================================================== --- trunk/storage/storage/src/include/ep-graph.ycp (original) +++ trunk/storage/storage/src/include/ep-graph.ycp Tue Feb 3 20:48:39 2009 @@ -11,7 +11,6 @@ void CreateGraphPanel(any user_data) { string filename = Directory::tmpdir + "/storage.dot"; - y2milestone("saving graph to %1", filename); Storage::SaveGraph(filename); UI::ReplaceWidget(`tree_panel, @@ -62,8 +61,11 @@ string filename = UI::AskForSaveFileName("/tmp", "*.dot", "Save as..."); if (filename != nil) { - y2milestone("saving graph to %1", filename); - Storage::SaveGraph(filename); + if (!Storage::SaveGraph(filename)) + { + // error popup + Popup::Error(_("Saving graph file failed.")); + } } } break; 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 Tue Feb 3 20:48:39 2009 @@ -6461,9 +6461,10 @@ } -global integer SaveGraph(string filename) +global boolean SaveGraph(string filename) { - integer ret = LibStorage::saveGraph(sint, filename); + boolean ret = LibStorage::saveGraph(sint, filename); + y2milestone("SaveGraph filename:%1 ret:%2", filename, ret); return ret; } -- 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] r55220 - /trunk/storage/libstorage/src/HumanString.cc
by aschnell＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: aschnell Date: Tue Feb 3 20:48:11 2009 New Revision: 55220 URL: http://svn.opensuse.org/viewcvs/yast?rev=55220&view=rev Log: - whitespace cleanup Modified: trunk/storage/libstorage/src/HumanString.cc Modified: trunk/storage/libstorage/src/HumanString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/HumanStri… ============================================================================== --- trunk/storage/libstorage/src/HumanString.cc (original) +++ trunk/storage/libstorage/src/HumanString.cc Tue Feb 3 20:48:11 2009 @@ -19,14 +19,14 @@ namespace storage { - + int numSuffixes() { return 6; } - - + + string getSuffix(int i, bool classic, bool sloppy = false) { @@ -38,7 +38,7 @@ else /* Byte abbreviated */ return classic ? "B" : _("B"); - + case 1: if (sloppy) /* Kilo abbreviated */ @@ -46,7 +46,7 @@ else /* KiloByte abbreviated */ return classic ? "kB" : _("kB"); - + case 2: if (sloppy) /* Mega abbreviated */ @@ -54,7 +54,7 @@ else /* MegaByte abbreviated */ return classic ? "MB" : _("MB"); - + case 3: if (sloppy) /* Giga abbreviated */ @@ -62,7 +62,7 @@ else /* GigaByte abbreviated */ return classic ? "GB" : _("GB"); - + case 4: if (sloppy) /* Tera abbreviated */ @@ -70,7 +70,7 @@ else /* TeraByte abbreviated */ return classic ? "TB" : _("TB"); - + case 5: if (sloppy) /* Peta abbreviated */ @@ -79,50 +79,50 @@ /* PetaByte abbreviated */ return classic ? "PB" : _("PB"); } - + return string("error"); } - - + + string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) { const locale loc = classic ? locale::classic() : locale(); - + double f = size; int i = 0; - + while (f >= 1024.0 && i + 1 < numSuffixes()) { f /= 1024.0; i++; } - + if (omit_zeroes && (f == (unsigned long long)(f))) { precision = 0; } - + ostringstream s; s.imbue(loc); s.setf(ios::fixed); s.precision(precision); - + s << f << ' ' << getSuffix(i, classic); - + return s.str(); } - - + + bool humanStringToByte(const string& str, bool classic, unsigned long long& size) { const locale loc = classic ? locale::classic() : locale(); - + const string str_trimmed = boost::trim_copy(str, loc); - + double f = 1.0; - + for (int i = 0; i < numSuffixes(); i++) { for (int j = 0; j < (classic ? 1 : 2); j++) @@ -131,13 +131,13 @@ if (boost::iends_with(str_trimmed, suffix, loc)) { string number = str_trimmed.substr(0, str_trimmed.size() - suffix.size()); - + istringstream s(boost::trim_copy(number, loc)); s.imbue(loc); - + double g; s >> g; - + if (!s.fail() && s.eof() && g >= 0.0) { size = g * f; @@ -145,11 +145,11 @@ } } } - + f *= 1024.0; } - + return 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] r55219 - /trunk/storage/libstorage/bindings/ycp/Makefile.am
by aschnell＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: aschnell Date: Tue Feb 3 18:40:28 2009 New Revision: 55219 URL: http://svn.opensuse.org/viewcvs/yast?rev=55219&view=rev Log: - fixed dependencies Modified: trunk/storage/libstorage/bindings/ycp/Makefile.am Modified: trunk/storage/libstorage/bindings/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/Makefile.am (original) +++ trunk/storage/libstorage/bindings/ycp/Makefile.am Tue Feb 3 18:40:28 2009 @@ -4,7 +4,10 @@ PLUGLIB_MODULE = LibStorage PLUGLIB_LIBRARY = ../../src/.libs/liby2storage.so -PLUGLIB_DEPEND = ../../src/StorageInterface.h +PLUGLIB_DEPEND = \ + ../../src/StorageInterface.h \ + ../../src/HumanString.h + ../../src/Graph.h include $(top_srcdir)/pluglib-bindings.ami -- 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] r55218 - in /trunk/storage: ./ libstorage/bindings/ycp/ libstorage/examples/ libstorage/src/ libstorage/testsuite/ storage/src/modules/
by aschnell＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: aschnell Date: Tue Feb 3 18:31:48 2009 New Revision: 55218 URL: http://svn.opensuse.org/viewcvs/yast?rev=55218&view=rev Log: - some restructuring affecting storage interface Added: trunk/storage/libstorage/src/Graph.h trunk/storage/libstorage/src/HumanString.cc trunk/storage/libstorage/src/HumanString.h Modified: trunk/storage/POTFILES trunk/storage/libstorage/bindings/ycp/LibStorage.i trunk/storage/libstorage/examples/SaveGraph.cc trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Graph.cc trunk/storage/libstorage/src/Makefile.am trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/testsuite/humanstring1.cc trunk/storage/libstorage/testsuite/humanstring2.cc trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/POTFILES?rev=55218&r1=55… ============================================================================== --- trunk/storage/POTFILES (original) +++ trunk/storage/POTFILES Tue Feb 3 18:31:48 2009 @@ -6,6 +6,7 @@ libstorage/src/DmCo.cc libstorage/src/EtcFstab.cc libstorage/src/EtcRaidtab.cc +libstorage/src/HumanString.cc libstorage/src/Loop.cc libstorage/src/LoopCo.cc libstorage/src/LvmLv.cc Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Tue Feb 3 18:31:48 2009 @@ -8,6 +8,8 @@ %{ #include "../../src/StorageInterface.h" +#include "../../src/HumanString.h" +#include "../../src/Graph.h" %} using namespace std; @@ -38,4 +40,6 @@ specialize_sequence(storage::CommitInfo, TO_PACK, FROM_PACK, CHECK) %include "../../src/StorageInterface.h" +%include "../../src/HumanString.h" +%include "../../src/Graph.h" Modified: trunk/storage/libstorage/examples/SaveGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Save… ============================================================================== --- trunk/storage/libstorage/examples/SaveGraph.cc (original) +++ trunk/storage/libstorage/examples/SaveGraph.cc Tue Feb 3 18:31:48 2009 @@ -2,6 +2,7 @@ #include <stdlib.h> #include <y2storage/StorageInterface.h> +#include <y2storage/Graph.h> using namespace storage; @@ -9,9 +10,9 @@ main (int argc, char** argv) { initDefaultLogger(); - StorageInterface* s = createStorageInterface (true, false, true); + StorageInterface* s = createStorageInterface(true, false, true); - s->saveGraph("storage.dot"); + saveGraph(s, "storage.dot"); exit(EXIT_SUCCESS); } Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Tue Feb 3 18:31:48 2009 @@ -10,7 +10,6 @@ #include <sys/types.h> #include <dirent.h> -#include <locale> #include <boost/algorithm/string.hpp> #include <blocxx/AppenderLogger.hpp> @@ -531,139 +530,6 @@ } -int -numSuffixes() -{ - return 6; -} - - -string -getSuffix(int i, bool classic, bool sloppy = false) -{ - switch (i) - { - case 0: - if (sloppy) - return ""; - else - /* Byte abbreviated */ - return classic ? "B" : _("B"); - - case 1: - if (sloppy) - /* Kilo abbreviated */ - return classic ? "k" : _("k"); - else - /* KiloByte abbreviated */ - return classic ? "kB" : _("kB"); - - case 2: - if (sloppy) - /* Mega abbreviated */ - return classic ? "M" : _("M"); - else - /* MegaByte abbreviated */ - return classic ? "MB" : _("MB"); - - case 3: - if (sloppy) - /* Giga abbreviated */ - return classic ? "G" : _("G"); - else - /* GigaByte abbreviated */ - return classic ? "GB" : _("GB"); - - case 4: - if (sloppy) - /* Tera abbreviated */ - return classic ? "T" : _("T"); - else - /* TeraByte abbreviated */ - return classic ? "TB" : _("TB"); - - case 5: - if (sloppy) - /* Peta abbreviated */ - return classic ? "P" : _("P"); - else - /* PetaByte abbreviated */ - return classic ? "PB" : _("PB"); - } - - return string("error"); -} - - -string -byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) -{ - const locale loc = classic ? locale::classic() : locale(); - - double f = size; - int i = 0; - - while (f >= 1024.0 && i + 1 < numSuffixes()) - { - f /= 1024.0; - i++; - } - - if (omit_zeroes && (f == (unsigned long long)(f))) - { - precision = 0; - } - - ostringstream s; - s.imbue(loc); - s.setf(ios::fixed); - s.precision(precision); - - s << f << ' ' << getSuffix(i, classic); - - return s.str(); -} - - -bool -humanStringToByte(const string& str, bool classic, unsigned long long& size) -{ - const locale loc = classic ? locale::classic() : locale(); - - const string str_trimmed = boost::trim_copy(str, loc); - - double f = 1.0; - - for (int i = 0; i < numSuffixes(); i++) - { - for (int j = 0; j < (classic ? 1 : 2); j++) - { - string suffix = getSuffix(i, classic, j != 0); - if (boost::iends_with(str_trimmed, suffix, loc)) - { - string number = str_trimmed.substr(0, str_trimmed.size() - suffix.size()); - - istringstream s(boost::trim_copy(number, loc)); - s.imbue(loc); - - double g; - s >> g; - - if (!s.fail() && s.eof() && g >= 0.0) - { - size = g * f; - return true; - } - } - } - - f *= 1024.0; - } - - return false; -} - - const string app_ws = " \t\n"; } Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Tue Feb 3 18:31:48 2009 @@ -100,12 +100,6 @@ string sformat(const char* format, ...); -string byteToHumanString(unsigned long long size, bool classic, int precision, - bool omit_zeroes); - -bool humanStringToByte(const string& str, bool classic, unsigned long long& size); - - inline const char* _(const char* msgid) { return dgettext("storage", msgid); Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue Feb 3 18:31:48 2009 @@ -6,9 +6,10 @@ #include <string> #include <fstream> #include <array> +#include <boost/algorithm/string.hpp> #include "config.h" -#include "y2storage/Storage.h" +#include "y2storage/Graph.h" using namespace std; @@ -66,151 +67,152 @@ s << " [" << edge.attributes << "]"; return s << ";"; } -} - - -int -Storage::saveGraph(const string& filename) -{ - list<Node> nodes; - list<Edge> edges; - deque<ContainerInfo> containers; - getContainers(containers); - for (deque<ContainerInfo>::iterator i1 = containers.begin(); - i1 != containers.end(); ++i1) + int + saveGraph(StorageInterface* s, const string& filename) { - switch (i1->type) - { - case DISK: { - - Node disk_node("device:" + i1->device, RANK_DISK, i1->device); - nodes.push_back(disk_node); + list<Node> nodes; + list<Edge> edges; - if (!i1->usedByDevice.empty()) - { - edges.push_back(Edge(disk_node.id, "device:" + i1->usedByDevice)); - } - - deque<PartitionInfo> partitions; - getPartitionInfo(i1->name, partitions); - for (deque<PartitionInfo>::iterator i2 = partitions.begin(); - i2 != partitions.end(); ++i2) - { - if (i2->partitionType == EXTENDED) - continue; - Node partition_node("device:" + i2->v.device, RANK_PARTITION, i2->v.device); - nodes.push_back(partition_node); + deque<ContainerInfo> containers; + s->getContainers(containers); + for (deque<ContainerInfo>::iterator i1 = containers.begin(); + i1 != containers.end(); ++i1) + { + switch (i1->type) + { + case DISK: { - edges.push_back(Edge(disk_node.id, partition_node.id)); + Node disk_node("device:" + i1->device, RANK_DISK, i1->device); + nodes.push_back(disk_node); - if (!i2->v.usedByDevice.empty()) + if (!i1->usedByDevice.empty()) { - edges.push_back(Edge(partition_node.id, "device:" + i2->v.usedByDevice, "color=green")); + edges.push_back(Edge(disk_node.id, "device:" + i1->usedByDevice)); } - if (!i2->v.mount.empty()) + deque<PartitionInfo> partitions; + s->getPartitionInfo(i1->name, partitions); + for (deque<PartitionInfo>::iterator i2 = partitions.begin(); + i2 != partitions.end(); ++i2) { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); - nodes.push_back(mountpoint_node); + if (i2->partitionType == EXTENDED) + continue; - edges.push_back(Edge(partition_node.id, mountpoint_node.id, "color=blue")); - } - } + Node partition_node("device:" + i2->v.device, RANK_PARTITION, i2->v.device); + nodes.push_back(partition_node); + + edges.push_back(Edge(disk_node.id, partition_node.id)); - } break; + if (!i2->v.usedByDevice.empty()) + { + edges.push_back(Edge(partition_node.id, "device:" + i2->v.usedByDevice, "color=green")); + } + + if (!i2->v.mount.empty()) + { + Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + nodes.push_back(mountpoint_node); - case LVM: { + edges.push_back(Edge(partition_node.id, mountpoint_node.id, "color=blue")); + } + } - Node vg_node("device:" + i1->device, RANK_LVMVG, i1->device); - nodes.push_back(vg_node); + } break; - deque<LvmLvInfo> lvs; - getLvmLvInfo(i1->name, lvs); - for (deque<LvmLvInfo>::iterator i2 = lvs.begin(); - i2 != lvs.end(); ++i2) - { - Node lv_node("device:" + i2->v.device, RANK_LVMLV, i2->v.device); - nodes.push_back(lv_node); + case LVM: { - edges.push_back(Edge(vg_node.id, lv_node.id)); + Node vg_node("device:" + i1->device, RANK_LVMVG, i1->device); + nodes.push_back(vg_node); - if (!i2->v.mount.empty()) + deque<LvmLvInfo> lvs; + s->getLvmLvInfo(i1->name, lvs); + for (deque<LvmLvInfo>::iterator i2 = lvs.begin(); + i2 != lvs.end(); ++i2) { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); - nodes.push_back(mountpoint_node); + Node lv_node("device:" + i2->v.device, RANK_LVMLV, i2->v.device); + nodes.push_back(lv_node); - edges.push_back(Edge(lv_node.id, mountpoint_node.id)); - } - } + edges.push_back(Edge(vg_node.id, lv_node.id)); + + if (!i2->v.mount.empty()) + { + Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + nodes.push_back(mountpoint_node); - } break; + edges.push_back(Edge(lv_node.id, mountpoint_node.id)); + } + } - case MD: { + } break; - deque<MdInfo> mds; - getMdInfo(mds); + case MD: { - for (deque<MdInfo>::iterator i2 = mds.begin(); i2 != mds.end(); ++i2) - { - Node md_node("device:" + i2->v.device, RANK_MD, i2->v.device, "color=red, fillcolor=yellow"); - nodes.push_back(md_node); + deque<MdInfo> mds; + s->getMdInfo(mds); - if (!i2->v.usedByDevice.empty()) + for (deque<MdInfo>::iterator i2 = mds.begin(); i2 != mds.end(); ++i2) { - edges.push_back(Edge(md_node.id, "device:" + i2->v.usedByDevice)); - } + Node md_node("device:" + i2->v.device, RANK_MD, i2->v.device, "color=red, fillcolor=yellow"); + nodes.push_back(md_node); - if (!i2->v.mount.empty()) - { - Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); - nodes.push_back(mountpoint_node); + if (!i2->v.usedByDevice.empty()) + { + edges.push_back(Edge(md_node.id, "device:" + i2->v.usedByDevice)); + } + + if (!i2->v.mount.empty()) + { + Node mountpoint_node("mountpoint:" + i2->v.mount, RANK_MOUNTPOINT, i2->v.mount); + nodes.push_back(mountpoint_node); - edges.push_back(Edge(md_node.id, mountpoint_node.id)); + edges.push_back(Edge(md_node.id, mountpoint_node.id)); + } } - } - } break; + } break; + } } - } - ofstream out(filename.c_str()); + ofstream out(filename.c_str()); - out << "// generated by YaST (" << PACKAGE_STRING << ")" << endl; + out << "// generated by YaST (" << PACKAGE_STRING << ")" << endl; - out << "digraph storage" << endl; - out << "{" << endl; - out << " node [shape=rectangle, style=filled, fontname=Helvetica];" << endl; - out << endl; + out << "digraph storage" << endl; + out << "{" << endl; + out << " node [shape=rectangle, style=filled, fontname=Helvetica];" << endl; + out << endl; - for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) - out << " " << (*node) << endl; + for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) + out << " " << (*node) << endl; - out << endl; + out << endl; - for (Ranks::const_iterator rank = ranks.begin(); rank != ranks.end(); ++rank) - { - list<string> ids; - for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) - if (node->rank == *rank) - ids.push_back(dotQuote(node->id)); + for (Ranks::const_iterator rank = ranks.begin(); rank != ranks.end(); ++rank) + { + list<string> ids; + for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) + if (node->rank == *rank) + ids.push_back(dotQuote(node->id)); - if (!ids.empty()) - out << " { rank=same; " << boost::join(ids, " ") << " };" << endl; - } - out << endl; + if (!ids.empty()) + out << " { rank=same; " << boost::join(ids, " ") << " };" << endl; + } + out << endl; + + for (list<Edge>::const_iterator edge = edges.begin(); edge != edges.end(); ++edge) + out << " " << (*edge) << endl; - for (list<Edge>::const_iterator edge = edges.begin(); edge != edges.end(); ++edge) - out << " " << (*edge) << endl; + out << "}" << endl; - out << "}" << endl; + out.close(); - out.close(); + return 0; + } - return 0; } Added: trunk/storage/libstorage/src/Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.h?r… ============================================================================== --- trunk/storage/libstorage/src/Graph.h (added) +++ trunk/storage/libstorage/src/Graph.h Tue Feb 3 18:31:48 2009 @@ -0,0 +1,25 @@ +#ifndef GRAPH_H +#define GRAPH_H + + +#include <string> + + +#include "StorageInterface.h" + + +namespace storage +{ + + /** + * Saves a graph of the storage devices as a DOT file for graphviz. + * + * @param filename filename of graph + * @return zero if all is ok, negative number to indicate an error + */ + int saveGraph(StorageInterface* s, const std::string& filename); + +} + + +#endif Added: trunk/storage/libstorage/src/HumanString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/HumanStri… ============================================================================== --- trunk/storage/libstorage/src/HumanString.cc (added) +++ trunk/storage/libstorage/src/HumanString.cc Tue Feb 3 18:31:48 2009 @@ -0,0 +1,155 @@ +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + +/* + Textdomain "storage" +*/ + + +#include <locale> +#include <boost/algorithm/string.hpp> + +#include "AppUtil.h" +#include "HumanString.h" + + +using namespace std; + + +namespace storage +{ + + int + numSuffixes() + { + return 6; + } + + + string + getSuffix(int i, bool classic, bool sloppy = false) + { + switch (i) + { + case 0: + if (sloppy) + return ""; + else + /* Byte abbreviated */ + return classic ? "B" : _("B"); + + case 1: + if (sloppy) + /* Kilo abbreviated */ + return classic ? "k" : _("k"); + else + /* KiloByte abbreviated */ + return classic ? "kB" : _("kB"); + + case 2: + if (sloppy) + /* Mega abbreviated */ + return classic ? "M" : _("M"); + else + /* MegaByte abbreviated */ + return classic ? "MB" : _("MB"); + + case 3: + if (sloppy) + /* Giga abbreviated */ + return classic ? "G" : _("G"); + else + /* GigaByte abbreviated */ + return classic ? "GB" : _("GB"); + + case 4: + if (sloppy) + /* Tera abbreviated */ + return classic ? "T" : _("T"); + else + /* TeraByte abbreviated */ + return classic ? "TB" : _("TB"); + + case 5: + if (sloppy) + /* Peta abbreviated */ + return classic ? "P" : _("P"); + else + /* PetaByte abbreviated */ + return classic ? "PB" : _("PB"); + } + + return string("error"); + } + + + string + byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) + { + const locale loc = classic ? locale::classic() : locale(); + + double f = size; + int i = 0; + + while (f >= 1024.0 && i + 1 < numSuffixes()) + { + f /= 1024.0; + i++; + } + + if (omit_zeroes && (f == (unsigned long long)(f))) + { + precision = 0; + } + + ostringstream s; + s.imbue(loc); + s.setf(ios::fixed); + s.precision(precision); + + s << f << ' ' << getSuffix(i, classic); + + return s.str(); + } + + + bool + humanStringToByte(const string& str, bool classic, unsigned long long& size) + { + const locale loc = classic ? locale::classic() : locale(); + + const string str_trimmed = boost::trim_copy(str, loc); + + double f = 1.0; + + for (int i = 0; i < numSuffixes(); i++) + { + for (int j = 0; j < (classic ? 1 : 2); j++) + { + string suffix = getSuffix(i, classic, j != 0); + if (boost::iends_with(str_trimmed, suffix, loc)) + { + string number = str_trimmed.substr(0, str_trimmed.size() - suffix.size()); + + istringstream s(boost::trim_copy(number, loc)); + s.imbue(loc); + + double g; + s >> g; + + if (!s.fail() && s.eof() && g >= 0.0) + { + size = g * f; + return true; + } + } + } + + f *= 1024.0; + } + + return false; + } + +} Added: trunk/storage/libstorage/src/HumanString.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/HumanStri… ============================================================================== --- trunk/storage/libstorage/src/HumanString.h (added) +++ trunk/storage/libstorage/src/HumanString.h Tue Feb 3 18:31:48 2009 @@ -0,0 +1,40 @@ +#ifndef HUMAN_STRING_H +#define HUMAN_STRING_H + + +#include <string> + + +namespace storage +{ + + /** + * Return a pretty description of a size with required precision + * and using B, kB, MB, GB, TB or PB as unit as appropriate. + * + * @param size size in bytes + * @param classic use classic locale + * @param precision number of fraction digits in output + * @param omit_zeroes if true omit trailing zeroes for exact values + * @return formatted string + */ + std::string byteToHumanString(unsigned long long size, bool classic, int precision, + bool omit_zeroes); + + /** + * Converts a size description using B, kB, MB, GB, TB or PB into an integer. + * + * @param str size string + * @param classic use classic locale + * @param size size in bytes + * @return true on successful conversion + * + * The conversion is always case-insensitive. With classic set to + * false the conversion is also sloppy concerning omission of 'B'. + */ + bool humanStringToByte(const std::string& str, bool classic, unsigned long long& size); + +} + + +#endif Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.… ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Tue Feb 3 18:31:48 2009 @@ -46,7 +46,8 @@ Md.cc Md.h \ Loop.cc Loop.h \ Nfs.cc Nfs.h \ - Graph.cc \ + HumanString.cc HumanString.h \ + Graph.cc Graph.h \ SystemCmd.cc SystemCmd.h \ OutputProcessor.cc OutputProcessor.h \ Regex.cc Regex.h \ Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Feb 3 18:31:48 2009 @@ -5875,19 +5875,6 @@ } -string Storage::byteToHumanString(unsigned long long size, bool classic, int precision, - bool omit_zeroes) const -{ - return storage::byteToHumanString(size, classic, precision, omit_zeroes); -} - - -bool Storage::humanStringToByte(const string& str, bool classic, unsigned long long& size) const -{ - return storage::humanStringToByte(str, classic, size); -} - - namespace storage { std::ostream& operator<< (std::ostream& s, Storage &v ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Feb 3 18:31:48 2009 @@ -471,10 +471,6 @@ bool checkDmMapsTo( const string& dev ); void updateDmEmptyPeMap(); void dumpObjectList(); - int saveGraph(const string& filename); - - string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const; - bool humanStringToByte(const string& str, bool classic, unsigned long long& size) const; void setCallbackProgressBar( storage::CallbackProgressBar pfnc ) { progress_bar_cb=pfnc; } Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Feb 3 18:31:48 2009 @@ -2118,14 +2118,6 @@ virtual void dumpObjectList() = 0; /** - * Saves a graph of the storage devices as DOT file for graphviz. - * - * @param filename filename of graph - * @return zero if all is ok, negative number to indicate an error - */ - virtual int saveGraph(const string& filename) = 0; - - /** * Split volume device name up into container name and a volume * name. For Containers where this is appropriate (e.g. disks, * MD, loop) also a volume number is provided. @@ -2136,32 +2128,6 @@ */ virtual int getContVolInfo( const string& dev, ContVolInfo& info) = 0; - /** - * Return a pretty description of a size with required precision - * and using B, kB, MB, GB, TB or PB as unit as appropriate. - * - * @param size size in bytes - * @param classic use classic locale - * @param precision number of fraction digits in output - * @param omit_zeroes if true omit trailing zeroes for exact values - * @return formatted string - */ - virtual string byteToHumanString(unsigned long long size, bool classic, int precision, - bool omit_zeroes) const = 0; - - /** - * Converts a size description using B, kB, MB, GB, TB or PB into an integer. - * - * @param str size string - * @param classic use classic locale - * @param size size in bytes - * @return true on successful conversion - * - * The conversion is always case-insensitive. With classic set to - * false the conversion is also sloppy concerning omission of 'B'. - */ - virtual bool humanStringToByte(const string& str, bool classic, unsigned long long& - size) const = 0; }; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue Feb 3 18:31:48 2009 @@ -20,6 +20,7 @@ #include "y2storage/OutputProcessor.h" #include "y2storage/EtcFstab.h" #include "y2storage/StorageDefines.h" +#include "y2storage/HumanString.h" using namespace std; using namespace storage; Modified: trunk/storage/libstorage/testsuite/humanstring1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/hum… ============================================================================== --- trunk/storage/libstorage/testsuite/humanstring1.cc (original) +++ trunk/storage/libstorage/testsuite/humanstring1.cc Tue Feb 3 18:31:48 2009 @@ -2,7 +2,7 @@ #include <iostream> #include <locale> -#include <y2storage/StorageInterface.h> +#include <y2storage/HumanString.h> using namespace std; using namespace storage; @@ -12,23 +12,18 @@ // during package build. -StorageInterface* s = 0; - - void test(const char* loc, unsigned long long size, bool classic, int precision, bool omit_zeroes) { locale::global(locale(loc)); - cout << s->byteToHumanString(size, classic, precision, omit_zeroes) << endl; + cout << byteToHumanString(size, classic, precision, omit_zeroes) << endl; } int main() { - s = createStorageInterface(true, true, false); - test("en_GB.UTF-8", 1024, true, 2, true); test("en_GB.UTF-8", 1024, true, 2, false); @@ -41,6 +36,4 @@ test("en_GB.UTF-8", 1000*1024, false, 2, false); test("de_DE.UTF-8", 1000*1024, false, 2, false); test("fr_FR.UTF-8", 1000*1024, false, 2, false); - - delete s; } Modified: trunk/storage/libstorage/testsuite/humanstring2.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/hum… ============================================================================== --- trunk/storage/libstorage/testsuite/humanstring2.cc (original) +++ trunk/storage/libstorage/testsuite/humanstring2.cc Tue Feb 3 18:31:48 2009 @@ -2,7 +2,7 @@ #include <iostream> #include <locale> -#include <y2storage/StorageInterface.h> +#include <y2storage/HumanString.h> using namespace std; using namespace storage; @@ -12,9 +12,6 @@ // during package build. -StorageInterface* s = 0; - - void test(const char* loc, const char* str, bool classic) { @@ -22,7 +19,7 @@ unsigned long long size = 0; - if (s->humanStringToByte(str, classic, size)) + if (humanStringToByte(str, classic, size)) cout << "parse ok " << size << endl; else cout << "parse error" << endl; @@ -32,8 +29,6 @@ int main() { - s = createStorageInterface(true, true, false); - test("en_GB.UTF-8", "42", true); // FAILS: classic=true needs a suffix test("en_GB.UTF-8", "42B", true); test("en_GB.UTF-8", "42 b", true); @@ -68,6 +63,4 @@ test("en_US.UTF-8", "5 G B", false); // FAILS test("de_DE.UTF-8", "12.34 kB", false); // FAILS test("fr_FR.UTF-8", "12 34 GB", false); // FAILS - - delete s; } 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 Tue Feb 3 18:31:48 2009 @@ -359,32 +359,32 @@ global string ByteToHumanString(integer bytes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, 2, false); + return LibStorage::byteToHumanString(bytes, false, 2, false); } global string KByteToHumanString(integer kbytes) { - return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, 2, false); + return LibStorage::byteToHumanString(kbytes * 1024, false, 2, false); } global string ByteToHumanStringWithPrecision(integer bytes, integer precision, boolean omit_zeroes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, precision, omit_zeroes); + return LibStorage::byteToHumanString(bytes, false, precision, omit_zeroes); } global string KByteToHumanStringWithPrecision(integer kbytes, integer precision, boolean omit_zeroes) { - return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, precision, omit_zeroes); + return LibStorage::byteToHumanString(kbytes * 1024, false, precision, omit_zeroes); } global boolean HumanStringToByte(string str, integer& bytes) { integer i = 0; bytes = i; // bnc #408829 and #408891 - boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + boolean ret = LibStorage::humanStringToByte(str, false, bytes); y2milestone("HumanStringToByte ret:%1 str:%2 bytes:%3", ret, str, bytes); return ret; } @@ -393,7 +393,7 @@ global boolean HumanStringToKByte(string str, integer& kbytes) { integer bytes = 0; // bnc #408829 - boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + boolean ret = LibStorage::humanStringToByte(str, false, bytes); kbytes = bytes / 1024; y2milestone("HumanStringToKByte ret:%1 str:%2 kbytes:%3", ret, str, kbytes); return ret; @@ -6271,7 +6271,7 @@ integer StrToByte(string str) { integer bytes = 0; - if (!LibStorage::StorageInterface::humanStringToByte(sint, str, true, bytes)) + if (!LibStorage::humanStringToByte(str, true, bytes)) y2error("cannot parse %1", str); return bytes; } @@ -6463,7 +6463,7 @@ global integer SaveGraph(string filename) { - integer ret = LibStorage::StorageInterface::saveGraph(sint, filename); + integer ret = LibStorage::saveGraph(sint, filename); return ret; } -- 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] r55217 - in /trunk/storage/storage/src/include: ep-lib.ycp lvm_ui_dialogs.ycp
by kmachalkova＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: kmachalkova Date: Tue Feb 3 17:58:29 2009 New Revision: 55217 URL: http://svn.opensuse.org/viewcvs/yast?rev=55217&view=rev Log: Removed some unused code - VGs and NFSs are now deleted differently Modified: trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Feb 3 17:58:29 2009 @@ -129,11 +129,6 @@ { return false; } - else if( tg[id,"type"]:`CT_UNKNOWN == `CT_LVM ) - { - string current_vg = substring( tg[id,"device"]:"", 5 ); - HandleRemoveVg( tg, current_vg ); - } else if( tg[id,"type"]:`CT_UNKNOWN == `CT_DMRAID ) { if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) @@ -225,11 +220,6 @@ Storage::DeleteLoop( disk["device"]:"", part["fpath"]:"", true ); } - if( part["type"]:`unknown == `nfs ) - { - Storage::DeleteDevice( "/dev/nfs", - part["device"]:"" ); - } else { Storage::DeleteDevice( disk["device"]:"", Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Tue Feb 3 17:58:29 2009 @@ -449,6 +449,7 @@ } +/* define boolean HandleRemoveVg( map<string,map> targetMap, string current_vg ) ``{ boolean ret = false; @@ -473,7 +474,6 @@ return( ret ); } -/* define map DlgCreateVolumeGroup( list vgm_list ) ``{ string vgname = ""; -- 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] r55216 - in /trunk/storage/storage/src/include: custom_part_check_generated.ycp ep-lib.ycp ep-lvm-lib.ycp
by kmachalkova＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: kmachalkova Date: Tue Feb 3 17:51:07 2009 New Revision: 55216 URL: http://svn.opensuse.org/viewcvs/yast?rev=55216&view=rev Log: (empty) Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Tue Feb 3 17:51:07 2009 @@ -586,13 +586,13 @@ if( used != `UB_NONE ) { - if( used == `UB_LVM) + /*if( used == `UB_LVM) { // popup text %2 is a device name, %1 is the volume group name Popup::Error(sformat(_("The device (%2) belongs to a volume group (%1). Remove it from the volume group before deleting it. "),curr_part["used_by"]:"" , part_name) ); - } + }*/ if( used == `UB_MD) { Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Feb 3 17:51:07 2009 @@ -7,6 +7,7 @@ { textdomain "storage"; + boolean EpDeleteVolumeGroup(string device); list<string> AddedToList(list<string> old, list<string> new) { @@ -44,6 +45,32 @@ return disk["device"]:""; } + boolean ConfirmDeletingUsedDevice( map <string, any> part, symbol used_by ) + { + switch (used_by) + { + case `UB_LVM: + if (Popup::AnyQuestion( _("Confirm Deleting Partition Used by LVM"), + sformat(_("The selected partition \"%1\" belongs to volume group \"%2\". +To keep system in consistent state, it is recommended to delete the volume group and +all its logical volumes before deleting the partition. + +Delete partition \"%1\" AND volume group \"%2\" now?"), part["device"]:"", part["used_by_device"]:""), + Label::DeleteButton(), + Label::CancelButton(), + `focus_no + )) + { + return EpDeleteVolumeGroup(part["used_by_device"]:""); + } + break; + //FIXME: add RAID case here + default: + break; + } + + return false; + } /** * Must be called before removing device. @@ -145,6 +172,7 @@ // with "delete = true" y2milestone( "delete part %1", part ); + boolean ask = true; ///////////////////////////////////////////////////// // check if the partition can be deleted @@ -153,18 +181,37 @@ { return false; } - if( part["type"]:`primary != `extended && - !check_device_delete( part, false, Stage::initial(), - disk )) + + if( part["type"]:`primary != `extended ) { - return false; + symbol used_by = check_devices_used( [ part ], false); + + if ( used_by != `UB_NONE) + { + if (!ConfirmDeletingUsedDevice( part, used_by )) + return false; + // whatever was using the defice is deleted by now + else + { + // but we must re-read target map to reflect current status + // i.e. device is no longer used by now + tg = Storage::GetTargetMap(); + part = Storage::GetPartition(tg, id); + // do not ask anymore - user has already confirmed deleting + ask = false; + } + } + + if (!check_device_delete( part, false, Stage::initial(), + disk )) + return false; } ///////////////////////////////////////////////////// // now delete partition!! // YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1 - if( Popup::YesNo( sformat(_("Really delete %1?"), + if( !ask || Popup::YesNo( sformat(_("Really delete %1?"), part["device"]:"" ))) { if( (search( id, "/dev/loop")==0 || Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Tue Feb 3 17:51:07 2009 @@ -125,13 +125,13 @@ } - void EpDeleteVolumeGroup(string device) + boolean EpDeleteVolumeGroup(string device) { if (device == nil) { // error popup Popup::Error(_("No volume group selected.")); - return; + return false; } string vgname = substring(device, 5); @@ -167,13 +167,17 @@ UpdateNavigationTree(`lvm); TreePanel::Create(); } + return true; } else { Popup::Error( sformat(_("Deleting volume group \"%1\" failed."), vgname)); //FIXME: some rollback? + return false; } } + else + return 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] r55215 - /trunk/control-center-gnome/TODO
by sreeves＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: sreeves Date: Tue Feb 3 17:45:09 2009 New Revision: 55215 URL: http://svn.opensuse.org/viewcvs/yast?rev=55215&view=rev Log: test commit rights Modified: trunk/control-center-gnome/TODO Modified: trunk/control-center-gnome/TODO URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/TODO?rev=55… ============================================================================== --- trunk/control-center-gnome/TODO (original) +++ trunk/control-center-gnome/TODO Tue Feb 3 17:45:09 2009 @@ -9,7 +9,6 @@ + Directory files + update 'Icon' in all of them ... - + Directory files + Getting translations [!] + (hmm) - merge from the 'group' files (?) -- 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] r55214 - /trunk/ca-management/src/ca_mgm_proposal.ycp
by mcalmer＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mcalmer Date: Tue Feb 3 16:37:40 2009 New Revision: 55214 URL: http://svn.opensuse.org/viewcvs/yast?rev=55214&view=rev Log: fix skipping certificate creation in proposal (bnc#471913) Modified: trunk/ca-management/src/ca_mgm_proposal.ycp Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Tue Feb 3 16:37:40 2009 @@ -201,7 +201,7 @@ CaMgm::prop_server_commonName = ((list)defaultSCmap["CN"]:[])[0]:""; - + ret = $[ "workflow_sequence" : `auto ]; } else @@ -211,19 +211,18 @@ } } } - - if (!check_mail_address(CaMgm::prop_email)) - { - ret = add( ret, "warning", _("Invalid e-mail format.")); - ret = add( ret, "warning_level", `blocker ); - } - + if (CaMgm::prop_selection == `def) { - + if (!check_mail_address(CaMgm::prop_email)) + { + ret = add( ret, "warning", _("Invalid e-mail format.")); + ret = add( ret, "warning_level", `blocker ); + } + if ( Users::GetRootPassword() == "" && size(CaMgm::prop_password) == 0) { - + UI::OpenDialog (`opt(`decorated ), `HBox(`VSpacing(10), `VBox ( -- 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] r55213 - /tags/stable-2_18_4/installation/
by locilka＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: locilka Date: Tue Feb 3 16:37:01 2009 New Revision: 55213 URL: http://svn.opensuse.org/viewcvs/yast?rev=55213&view=rev Log: Created tag stable-2_18_4 for installation Added: tags/stable-2_18_4/installation/ - copied from r55212, trunk/installation/ -- 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] r55212 - /branches/SuSE-Code-11-Branch/ca-management/src/ca_mgm_proposal.ycp
by mcalmer＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mcalmer Date: Tue Feb 3 16:29:29 2009 New Revision: 55212 URL: http://svn.opensuse.org/viewcvs/yast?rev=55212&view=rev Log: fix skipping certificate creation in proposal (bnc#471913) Modified: branches/SuSE-Code-11-Branch/ca-management/src/ca_mgm_proposal.ycp Modified: branches/SuSE-Code-11-Branch/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ca-manage… ============================================================================== --- branches/SuSE-Code-11-Branch/ca-management/src/ca_mgm_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/ca-management/src/ca_mgm_proposal.ycp Tue Feb 3 16:29:29 2009 @@ -201,7 +201,7 @@ CaMgm::prop_server_commonName = ((list)defaultSCmap["CN"]:[])[0]:""; - + ret = $[ "workflow_sequence" : `auto ]; } else @@ -211,19 +211,18 @@ } } } - - if (!check_mail_address(CaMgm::prop_email)) - { - ret = add( ret, "warning", _("Invalid e-mail format.")); - ret = add( ret, "warning_level", `blocker ); - } - + if (CaMgm::prop_selection == `def) { - + if (!check_mail_address(CaMgm::prop_email)) + { + ret = add( ret, "warning", _("Invalid e-mail format.")); + ret = add( ret, "warning_level", `blocker ); + } + if ( Users::GetRootPassword() == "" && size(CaMgm::prop_password) == 0) { - + UI::OpenDialog (`opt(`decorated ), `HBox(`VSpacing(10), `VBox ( -- 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] r55211 - in /trunk/nfs-server: VERSION package/yast2-nfs-server.changes src/routines.ycp src/ui.ycp
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 16:26:28 2009 New Revision: 55211 URL: http://svn.opensuse.org/viewcvs/yast?rev=55211&view=rev Log: Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). Modified: trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/routines.ycp trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=55211&r1=… ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Tue Feb 3 16:26:28 2009 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Tue Feb 3 16:26:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 16:26:12 CET 2009 - mvidner(a)suse.cz + +- Fixed the help for NFS4 bind mounts; added crossmnt (bnc#471874). +- 2.17.6 + +------------------------------------------------------------------- Wed Dec 3 16:07:28 CET 2008 - kmachalkova(a)suse.cz - Missing strings marked for translation (bnc#449700) Modified: trunk/nfs-server/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-server/src/routines.ycp (original) +++ trunk/nfs-server/src/routines.ycp Tue Feb 3 16:26:28 2009 @@ -200,7 +200,7 @@ if (withfsid) return default_options; else - return "fsid=0," + default_options; + return "fsid=0,crossmnt" + default_options; // bnc#471874 c1 } Modified: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=55211&… ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Tue Feb 3 16:26:28 2009 @@ -511,7 +511,16 @@ // Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled. help_text = help_text + _("The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client."); - help_text = help_text + _("In case of multiple exports to a NFSv4 client, you need to bind the exported paths with no fsid=0 to the one with fsid=0. To do this, add another export option (bind=/target/path), where /target/path amounts to some directory existing below the fsid=0 exported tree."); + // bnc#471874, NFS4 is complex and so is our UI :-/ + // but let's fix the help at least + // Watch out, the space is necessary between br and slash. + help_text = help_text + _("In case of multiple exports to a NFSv4 client, +you need to bind the exported paths with no fsid=0 to the one with fsid=0. +To export the server paths <tt>/data</tt> and <tt>/data2</tt> as +<tt>/</tt> and <tt>/more</tt>, respectively, use +<pre>/data 10.0.0.1(fsid=0,crossmnt,ro,...) +/data/more 10.0.0.1(bind=/data2,ro,...)</pre> +"); } // Help, part 5 of 5 -- 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] r55210 - in /trunk/storage: ./ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: aschnell Date: Tue Feb 3 16:06:37 2009 New Revision: 55210 URL: http://svn.opensuse.org/viewcvs/yast?rev=55210&view=rev Log: - select 'previous' device in tables after deleting devices (bnc #465138) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=55210&r1=552… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Tue Feb 3 16:06:37 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 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 Tue Feb 3 16:06:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 03 16:05:21 CET 2009 - aschnell(a)suse.de + +- select 'previous' device in tables after deleting devices (bnc + #465138) +- 2.18.4 + +------------------------------------------------------------------- Thu Jan 29 15:22:35 CET 2009 - aschnell(a)suse.de - changed method to disable automounter (since "overnight" GNOME Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Feb 3 16:06:37 2009 @@ -158,7 +158,7 @@ if (size(ret) == 0) { // error popup - Popup::Error(sformat(_("It is not possible to create a partition on %1."), + Popup::Error(sformat(_("It is not possible to create a partition on %1."), disk_device)); } @@ -311,7 +311,7 @@ } - void EpDeletePartition(string device) + void EpDeletePartition(string device, symbol context) { if (device == nil) { @@ -321,12 +321,26 @@ } string parent = ParentDevice(device); + string next = NextDeviceAfterDelete(device); if (EpDeleteDevice(device)) { UpdateMainStatus(); - UpdateNavigationTree(parent); - TreePanel::Create(); + + switch (context) + { + case `table: + UpdateNavigationTree(nil); + TreePanel::Create(); + if (!isempty(next)) + UI::ChangeWidget(`id(`table), `CurrentItem, next); + break; + + case `overview: + UpdateNavigationTree(parent); + TreePanel::Create(); + break; + } } } Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Feb 3 16:06:37 2009 @@ -344,7 +344,7 @@ break; case `delete: - EpDeletePartition(part_device); + EpDeletePartition(part_device, `table); break; case `create_partition_table: @@ -489,7 +489,7 @@ break; case `delete: - EpDeletePartition(part_device); + EpDeletePartition(part_device, `overview); break; } UI::SetFocus(`id(`text)); Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Feb 3 16:06:37 2009 @@ -20,6 +20,9 @@ } + /** + * Must be called before removing device. + */ string ParentDevice(string device) { map<string, map> target_map = Storage::GetTargetMap(); @@ -42,6 +45,36 @@ } + /** + * Must be called before removing device. + */ + string NextDeviceAfterDelete(string device) + { + map<string, map> target_map = Storage::GetTargetMap(); + + string parent = ParentDevice(device); + + list<string> partitions = maplist(map part, target_map[parent, "partitions"]:[], { + return part["device"]:""; + }); + + integer index = -1; + foreach(integer i, Integer::Range(size(partitions)), { + if (partitions[i]:"" == device) + index = i; + }); + + string ret = ""; + if (index > 0) + ret = partitions[index - 1]:""; + else if (size(partitions) > 1) + ret = partitions[1]:""; + + y2milestone("NextDeviceAfterDelete device:%1 ret:%2", device, ret); + return ret; + } + + boolean EpDeleteDevice(string id) { map<string,map> tg = Storage::GetTargetMap(); Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Tue Feb 3 16:06:37 2009 @@ -143,7 +143,7 @@ //how many of those we have? integer count = size(log_volumes); - boolean proceed = (count > 0) ? + boolean proceed = (count > 0) ? //non-empty VG - make sure user wants to delete all LVs ConfirmVgDelete(vgname, log_volumes) : //empty VG - simple @@ -272,7 +272,7 @@ } - void EpDeleteLogicalVolume(string device) + void EpDeleteLogicalVolume(string device, symbol context) { if (device == nil) { @@ -282,12 +282,26 @@ } string parent = ParentDevice(device); + string next = NextDeviceAfterDelete(device); if (EpDeleteDevice(device)) { UpdateMainStatus(); - UpdateNavigationTree(parent); - TreePanel::Create(); + + switch (context) + { + case `table: + UpdateNavigationTree(nil); + TreePanel::Create(); + if (!isempty(next)) + UI::ChangeWidget(`id(`table), `CurrentItem, next); + break; + + case `overview: + UpdateNavigationTree(parent); + TreePanel::Create(); + break; + } } } } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Tue Feb 3 16:06:37 2009 @@ -177,7 +177,7 @@ break; case `delete: - EpDeleteLogicalVolume(lv_device); + EpDeleteLogicalVolume(lv_device, `table); break; } UI::SetFocus(`id(`table)); @@ -305,7 +305,7 @@ break; case `delete: - EpDeleteLogicalVolume(device); + EpDeleteLogicalVolume(device, `overview); break; } } 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 Tue Feb 3 16:06:37 2009 @@ -4127,26 +4127,6 @@ return mountPoints; } -global define string -GetIdSmaller( string disk, integer delim ) - ``{ - string ret = disk; - map<string,map> tg = GetTargetMap(); - if( haskey( tg[disk,"partitions",0]:$[], "nr" )) - { - list<map> ps = filter( map p, tg[disk,"partitions"]:[], ``(p["nr"]:0<delim)); - if( size(ps)>1 ) - ps = sort( map a, map b, ps, ``(a["nr"]:0>b["nr"]:0)); - if( size(ps)>0 ) - ret = ps[0,"device"]:""; - } - else - ret = tg[disk,"partitions",0,"device"]:disk; - y2milestone( "GetIdSmaller disk:%1 delim:%2 ret:%3", - disk, delim, ret ); - return( ret ); - } - /** * Set <key> in partition <device> to the given <value> and return changed map <tg> -- 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] r55209 - /tags/stable-2_18_0/ldap-client/
by jsuchome＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: jsuchome Date: Tue Feb 3 15:44:11 2009 New Revision: 55209 URL: http://svn.opensuse.org/viewcvs/yast?rev=55209&view=rev Log: Created tag stable-2_18_0 for ldap-client Added: tags/stable-2_18_0/ldap-client/ - copied from r55208, trunk/ldap-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] r55208 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: jsuchome Date: Tue Feb 3 15:44:05 2009 New Revision: 55208 URL: http://svn.opensuse.org/viewcvs/yast?rev=55208&view=rev Log: - do not require entering data when disabling LDAP (bnc#471852) - 2.18.0 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=55208&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Tue Feb 3 15:44:05 2009 @@ -1 +1 @@ -2.17.18 +2.18.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Tue Feb 3 15:44:05 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 15:37:38 CET 2009 - jsuchome(a)suse.cz + +- do not require entering data when disabling LDAP (bnc#471852) +- 2.18.0 + +------------------------------------------------------------------- Thu Jan 15 14:45:54 CET 2009 - jsuchome(a)suse.cz - show port in the server field, read the data if there were Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=55208… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Tue Feb 3 15:44:05 2009 @@ -377,11 +377,15 @@ } } - if (result == `next || result == `advanced) { + if (result == `next || result == `advanced) + { base_dn = (string) UI::QueryWidget(`id(`ldapbasedn), `Value); autofs = Ldap::_autofs_allowed && (boolean) UI::QueryWidget (`id (`autofs), `Value); + } + if ((result == `next || result == `advanced) && start) + { if (base_dn == "") { // error popup label -- 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] r55207 - in /trunk/ftp-server: package/yast2-ftp-server.changes src/FtpServer.ycp
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 15:23:31 2009 New Revision: 55207 URL: http://svn.opensuse.org/viewcvs/yast?rev=55207&view=rev Log: selected text for localization Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/FtpServer.ycp Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Tue Feb 3 15:23:31 2009 @@ -1,3 +1,8 @@ +------------------------------------------------------------------ +Tue Feb 03 15:12:18 CEST 2008 - juhliarik(a)suse.cz + +- selected text for localization (bnc #446659) + ------------------------------------------------------------------- Thu Nov 20 12:35:28 CET 2008 - juhliarik(a)suse.cz Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev… ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Tue Feb 3 15:23:31 2009 @@ -243,7 +243,7 @@ "AnonAuthen" : "1", // 0 => anonymous only, 1 => authenticated only, 2=> both "AnonReadOnly" : "YES", "AnonCreatDirs" : "NO", - "Banner" : "Welcome message", + "Banner" : _("Welcome message"), "SSLEnable" : "NO", "SSLv2" : "NO", //enable/disable SSL version 2 (vsftpd only) "SSLv3" : "NO", //enable/disable SSL version 3 (vsftpd only) -- 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] r55206 - /tags/branch-Code-11-2_17_4/ftp-server/
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 14:47:11 2009 New Revision: 55206 URL: http://svn.opensuse.org/viewcvs/yast?rev=55206&view=rev Log: Created tag branch-Code-11-2_17_4 for ftp-server Added: tags/branch-Code-11-2_17_4/ftp-server/ - copied from r55205, branches/SuSE-Code-11-Branch/ftp-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] r55205 - in /branches/SuSE-Code-11-Branch/ftp-server: VERSION package/yast2-ftp-server.changes
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 14:46:59 2009 New Revision: 55205 URL: http://svn.opensuse.org/viewcvs/yast?rev=55205&view=rev Log: new package 2.17.4 Modified: branches/SuSE-Code-11-Branch/ftp-server/VERSION branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes Modified: branches/SuSE-Code-11-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/ftp-server/VERSION Tue Feb 3 14:46:59 2009 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-Branch/ftp-server/package/yast2-ftp-server.changes Tue Feb 3 14:46:59 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 03 14:34:18 CEST 2008 - juhliarik(a)suse.cz + +- selected text for translation (bnc #446659) +- 2.17.4 + +------------------------------------------------------------------- Thu Nov 20 12:35:28 CET 2008 - juhliarik(a)suse.cz - updated ftp-server for using yast module Users (bnc #445463) -- 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] r55204 - /branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp
by juhliarik＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: juhliarik Date: Tue Feb 3 14:30:25 2009 New Revision: 55204 URL: http://svn.opensuse.org/viewcvs/yast?rev=55204&view=rev Log: selected text for translation Modified: branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp Modified: branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ftp-serve… ============================================================================== --- branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp (original) +++ branches/SuSE-Code-11-Branch/ftp-server/src/FtpServer.ycp Tue Feb 3 14:30:25 2009 @@ -243,7 +243,7 @@ "AnonAuthen" : "1", // 0 => anonymous only, 1 => authenticated only, 2=> both "AnonReadOnly" : "YES", "AnonCreatDirs" : "NO", - "Banner" : "Welcome message", + "Banner" : _("Welcome message"), "SSLEnable" : "NO", "SSLv2" : "NO", //enable/disable SSL version 2 (vsftpd only) "SSLv3" : "NO", //enable/disable SSL version 3 (vsftpd only) -- 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] r55203 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: lslezak Date: Tue Feb 3 14:30:00 2009 New Revision: 55203 URL: http://svn.opensuse.org/viewcvs/yast?rev=55203&view=rev Log: - better validity check Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 3 14:30:00 2009 @@ -42,7 +42,7 @@ it != name.end(); ++it) { - if (!isalnum(*it) && (*it) != '_') + if (!isupper(*it) && !islower(*it) && (*it) != '_') { *it = '_'; } -- 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] r55202 - in /branches/tmp/lslezak/core: dbus/namespace_service/ liby2dbus/src/
by lslezak＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: lslezak Date: Tue Feb 3 14:19:41 2009 New Revision: 55202 URL: http://svn.opensuse.org/viewcvs/yast?rev=55202&view=rev Log: - Dbus service - replace invalid characters in the name space by underscore ('_') when registering a DBus object (e.g. "YaPI::USERS"->"YaPI__USERS"), export two interfaces: org.opensuse.yast.modules.YCPValues for using marshalled YCPValues in '(bsv)' structure org.opensuse.yast.modules.Values for using native DBus types, missing types are encoded as strings Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Tue Feb 3 14:19:41 2009 @@ -36,6 +36,19 @@ } } +void MakeValidObjectName(std::string &name) +{ + for(std::string::iterator it = name.begin(); + it != name.end(); + ++it) + { + if (!isalnum(*it) && (*it) != '_') + { + *it = '_'; + } + } +} + DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), wfm(NULL) { init_wfm(); @@ -55,12 +68,14 @@ else { ns->initialize(); - y2milestone("Imported name space: %s", it->c_str()); + std::string objname(*it); + MakeValidObjectName(objname); - nsmap[*it] = ns; + y2milestone("Imported name space: %s, using object name: %s", it->c_str(), objname.c_str()); + + nsmap[objname] = ns; } } - } DBusModulesServer::~DBusModulesServer() @@ -73,7 +88,7 @@ } } -void DBusModulesServer::registerFunctions(const std::string &interface_prefix) +void DBusModulesServer::registerFunctions(const std::string &interface_prefix, bool do_marshalling) { for (NameSpaceMap::const_iterator it = nsmap.begin(); it != nsmap.end(); @@ -106,7 +121,7 @@ DBusSignature sig; // add return type - std::string rett(Y2Dtype(rettype)); + std::string rett(do_marshalling ? "(bsv)" : Y2Dtype(rettype)); if (!rett.empty()) { @@ -121,7 +136,7 @@ bool params_ok = true; while(parindex < params) { - std::string partype(Y2Dtype(fptr->parameterType(parindex))); + std::string partype(do_marshalling ? "(bsv)" : Y2Dtype(fptr->parameterType(parindex))); if (!partype.empty()) { @@ -142,7 +157,7 @@ { sig.params = p; // register the function: register_function(object, interface, method, signature, handler) - register_method(ns->name(), interface_prefix, name, sig, e); + register_method(it->first, interface_prefix, name, sig, e); } } } @@ -167,25 +182,12 @@ case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break; case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break; -// case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING; break; + case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; + case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; default : y2warning("Value type %d is not supported", vt); break; -/* - case(YT_MAP) : ret = DBUS_TYPE__AS_STRING; break; - case(YT_) : ret = DBUS_TYPE__AS_STRING; break; - - YT_BYTEBLOCK = 5, - YT_LIST = 8, - YT_TERM = 9, - YT_MAP = 10, - YT_CODE = 11, // YCode as YCPValue - YT_RETURN = 12, // value of 'return;' - YT_BREAK = 13, // value of 'break;' - YT_ENTRY = 14, // just a placeholder for a SymbolEntry belonging to a function (i.e. foreach()) - YT_ERROR = 15, // error value, will cause trouble - YT_REFERENCE = 16, // a reference to a variable - YT_EXTERNAL = 17 // a reference to an external data -*/ } return ret; @@ -228,7 +230,8 @@ bool DBusModulesServer::connect() { - registerFunctions("org.opensuse.yast.modules"); + registerFunctions("org.opensuse.yast.modules.YCPValues", true); + registerFunctions("org.opensuse.yast.modules.Values", false); return DBusServerBase::connect(SYSTEM, "org.opensuse.yast.modules"); } @@ -237,8 +240,9 @@ YCPValue ret; DBusMsg reply; - std::string method = request.method(); - std::string object = request.path(); + std::string method(request.method()); + std::string object(request.path()); + std::string interface(request.interface()); // remove the leading slash from the object name if (!object.empty() && object[0] == '/') @@ -246,7 +250,7 @@ object.erase(object.begin()); } - y2debug("Requested object: %s, method: %s", object.c_str(), method.c_str()); + y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str()); constTypePtr t = searchFuncType(object, method); @@ -303,7 +307,15 @@ if (!ret.isNull()) { y2milestone("Result: %s", ret->toString().c_str()); - reply.addYCPValue(ret); + + if (interface == "org.opensuse.yast.modules.Values") + { + reply.addValue(ret); + } + else + { + reply.addYCPValue(ret); + } } return reply; Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Tue Feb 3 14:19:41 2009 @@ -46,7 +46,7 @@ std::string Y2Dtype(constTypePtr type) const; // register the functions from the namespace to DBus service - void registerFunctions(const std::string &interface_prefix); + void registerFunctions(const std::string &interface_prefix, bool do_marshalling); DBusMsg handler(const DBusMsg &request); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc Tue Feb 3 14:19:41 2009 @@ -222,6 +222,148 @@ return ret; } +bool DBusMsg::addValue(const YCPValue &val) +{ + if (val.isNull()) + { + y2milestone("Ignoring YCPNull value"); + return false; + } + + y2debug("Adding YCP value: %s", val->toString().c_str()); + + // create insert iterator + DBusMessageIter it; + dbus_message_iter_init_append(msg, &it); + + // add the value + bool ret = addValueAt(val, &it); + + return ret; +} + +bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i) +{ + int type = typeInt(val); + + if (val->isInteger()) + { + dbus_int64_t i64 = val->asInteger()->value(); + addValue(type, &i64, i); + } + else if (val->isFloat()) + { + double d = val->asFloat()->value(); + addValue(type, &d, i); + } + else if (val->isString()) + { + const char *str = val->asString()->value().c_str(); + addValue(type, &str, i); + } + else if (val->isBoolean()) + { + dbus_bool_t b = val->asBoolean()->value(); + addValue(type, &b, i); + } + // add path and symbol as string + else if (val->isPath() || val->isSymbol() || val->isTerm() || val->isCode()) + { + std::string val_str(val->toString()); + const char *str = val_str.c_str(); + // add path as a string + addValue(type, &str, i); + } + else if (val->isList()) + { + YCPList lst = val->asList(); + int sz = lst->size(); + int index = 0; + + DBusMessageIter array_it; + + // open array container + y2debug("Opening array container"); + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "v", &array_it); + while(index < sz) + { + y2debug("Adding YCP value at index %d", index); + // add VARIANT container + DBusMessageIter var_it; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(lst->value(index)), &var_it); + + // add the raw YCP value + addValueAt(lst->value(index), &array_it); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it); + + index++; + } + + // close array container + y2debug("Closing array container"); + dbus_message_iter_close_container(i, &array_it); + } + else if (val->isMap()) + { + YCPMap map = val->asMap(); + + DBusMessageIter array_it; + + // open array container + y2debug("Opening DICT container"); + dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "{vv}", &array_it); + + for(YCPMapIterator mit = map.begin(); mit != map.end() ; ++mit) + { + YCPValue key = mit.key(); + YCPValue val = mit.value(); + + DBusMessageIter map_item_it; + y2debug("Opening map item container"); + + dbus_message_iter_open_container(&array_it, DBUS_TYPE_DICT_ENTRY, 0, &map_item_it); + + // add VARIANT container + DBusMessageIter var_it; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(key), &var_it); + + // add the key + addValueAt(key, &var_it); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it); + + + // add VARIANT container + DBusMessageIter var_it2; + dbus_message_iter_open_container(&array_it, DBUS_TYPE_VARIANT, typeStr(val), &var_it2); + + // add the key + addValueAt(val, &var_it2); + + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(&array_it, &var_it2); + + // close map item + dbus_message_iter_close_container(&array_it, &map_item_it); + } + + // close array container + dbus_message_iter_close_container(i, &array_it); + } + else + { + y2error("Unsupported type %s, value: %s", Type::vt2type(val->valuetype())->toString().c_str(), + val->toString().c_str()); + + // TODO add as string? + } + + return true; +} + bool DBusMsg::addYCPValueRaw(const YCPValue &val, DBusMessageIter *i) { int type = typeInt(val); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h Tue Feb 3 14:19:41 2009 @@ -43,6 +43,8 @@ bool addDouble(double val); bool addYCPValue(const YCPValue &val); + bool addValue(const YCPValue &val); + YCPValue getYCPValue(int index) const; bool isMethodCall(const std::string &interface, const std::string &method) const; @@ -62,6 +64,7 @@ bool addValue(int type, void* data); bool addValue(int type, void* data, DBusMessageIter *i); + bool addValueAt(const YCPValue &val, DBusMessageIter *i); bool addYCPValue(const YCPValue &v, DBusMessageIter *i); bool addYCPValueRaw(const YCPValue &val, DBusMessageIter *i); void release(); Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Tue Feb 3 14:19:41 2009 @@ -175,7 +175,7 @@ // handle Introspection request from "org.freedesktop.DBus.Introspectable" "Introspect" if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { - y2milestone("Requesting path: %s", request.path().c_str()); + y2milestone("Introspecting object: %s", request.path().c_str()); std::string introspect; // root node? -- 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] r55201 - in /trunk/audit-laf/src: AuditLaf.ycp complex.ycp
by gs＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: gs Date: Tue Feb 3 11:09:43 2009 New Revision: 55201 URL: http://svn.opensuse.org/viewcvs/yast?rev=55201&view=rev Log: save inititial settings to be able to decide whether changes are made Modified: trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=5… ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Tue Feb 3 11:09:43 2009 @@ -44,10 +44,6 @@ import "Service"; -/** - * Prototypes - */ -global boolean Modified(); /** * Data was modified? @@ -80,9 +76,9 @@ boolean rules_locked = false; /* - * The rules have been checked + * The rules have been changed (sent to 'autitctl' to check the syntax) */ -boolean rules_checked = false; +boolean rules_changed = false; global void SetRulesLocked( boolean value ) { @@ -94,11 +90,11 @@ } global void SetRulesChanged( boolean value ) { - rules_checked = value; + rules_changed = value; } global boolean RulesChanged() { - return rules_checked; + return rules_changed; } /** @@ -134,6 +130,8 @@ modified = value; } + + global boolean ProposalValid() { return proposal_valid; } @@ -241,9 +239,15 @@ "disk_error_action" : "SUSPEND" ]; +/* + * Save settings initially read from /etc/audit/auditd.conf to be able + * to decide whether changes are made + */ +map <string, string> INITIAL_SETTINGS = $[]; + /** * Rules for the subsystem audit (passed via auditctl). - * Iinitially read from /etc/audit/audit.rules and edited in + * Initially read from /etc/audit/audit.rules and edited in * the rules editor. */ string RULES = ""; @@ -253,6 +257,16 @@ */ string INITIAL_RULES = ""; +/* + * Set data modified only if really has changed + */ +global void SetDataModified() { + if ( INITIAL_SETTINGS != SETTINGS || INITIAL_RULES != RULES ) + modified = true; + else + modified = false; +} + /** * Get value of given option from SEETINGS */ @@ -311,7 +325,7 @@ if ( rules != nil && rules != "" ) { RULES = rules; - // additionally save initial settings + // additionally save initial rules INITIAL_RULES = rules; return true; } @@ -349,6 +363,9 @@ if (val != nil) SETTINGS[key] = val; }); + // additionally save initial settings + INITIAL_SETTINGS = SETTINGS; + y2milestone("%1 has been read: %2", config_file, SETTINGS); return true; } Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Tue Feb 3 11:09:43 2009 @@ -143,8 +143,6 @@ */ void StoreLogfileSettingsDialog (string id, map event) { - AuditLaf::SetModified( true ); - // Store all values in SETTINGS AuditLaf::SetAuditdOption( "freq", tostring( (integer)UI::QueryWidget( `id("freq"), `Value ) ) ); AuditLaf::SetAuditdOption( "num_logs", tostring( (integer)UI::QueryWidget( `id("num_logs"), `Value ) ) ); @@ -174,6 +172,8 @@ } } + AuditLaf::SetDataModified(); + y2milestone( "Store log file settings" ); } @@ -214,14 +214,14 @@ */ void StoreDispatcherDialog (string id, map event) { - AuditLaf::SetModified( true ); - // Store all values in SETTINGS foreach (string key, ["dispatcher", "disp_qos"], { AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); + AuditLaf::SetDataModified( ); + y2milestone( "Store dispatcher dialog" ); } @@ -303,17 +303,17 @@ if ( ! FileUtils::Exists( file ) ) { - Report::Error( sformat( "%1 doesn't exist.\n", file ) + message ); + Report::Error( sformat(_("%1 doesn't exist.\n"), file ) + message ); ret = false; } else if ( ! FileUtils::IsFile( file ) ) { - Report::Error( sformat( "%1 is not a regular file.\n", file ) + message ); + Report::Error( sformat(_("%1 is not a regular file.\n"), file ) + message ); ret = false; } else if ( FileUtils::GetOwnerUserID( file ) != 0 ) { - Report::Error( sformat( "%1 not owned by root.\n", file ) + message ); + Report::Error( sformat(_("%1 not owned by root.\n"), file ) + message ); ret = false; } else @@ -323,7 +323,7 @@ if ( substring ( output["stdout"]:"", 0, 10 ) != "-rwxr-x---" ) { - Report::Error( sformat( "File permissiones of %1 NOT set to -rwxr-x---.\n", file ) + message ); + Report::Error( sformat(_("File permissiones of %1 NOT set to -rwxr-x---.\n"), file ) + message ); ret = false; } } @@ -338,8 +338,6 @@ string option = ""; string exec = ""; - AuditLaf::SetModified( true ); - foreach ( string key, ["space_left", "action_mail_acct", "admin_space_left" @@ -367,6 +365,8 @@ AuditLaf::SetAuditdOption( key, option ); } }); + + AuditLaf::SetDataModified( ); y2milestone( "Store disk space settings" ); } @@ -576,12 +576,12 @@ */ void StoreRulesDialog( string id, map event) { - AuditLaf::SetModified( true ); - string rules = (string)UI::QueryWidget( `id("rules"), `Value ); AuditLaf::SetRules( rules ); + AuditLaf::SetDataModified( ); + y2debug( "RULES: %1", rules ); y2milestone( "Store rules dialog" ); } -- 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] r55200 - /tags/branch-Code-11-2_17_65/yast2/
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 10:01:40 2009 New Revision: 55200 URL: http://svn.opensuse.org/viewcvs/yast?rev=55200&view=rev Log: Created tag branch-Code-11-2_17_65 for yast2 Added: tags/branch-Code-11-2_17_65/yast2/ - copied from r55199, branches/SuSE-Code-11-Branch/yast2/ -- 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] r55199 - in /branches/SuSE-Code-11-Branch/yast2: VERSION package/yast2.changes scripts/yast2
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:47:34 2009 New Revision: 55199 URL: http://svn.opensuse.org/viewcvs/yast?rev=55199&view=rev Log: Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). (manual merge from trunk) Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Tue Feb 3 09:47:34 2009 @@ -1 +1 @@ -2.17.64 +2.17.65 Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Tue Feb 3 09:47:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 09:27:34 CET 2009 - mvidner(a)suse.cz + +- Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). +- 2.17.65 + +------------------------------------------------------------------- Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz - fixed bash completion (bnc #470544) Modified: branches/SuSE-Code-11-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/scr… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-Branch/yast2/scripts/yast2 Tue Feb 3 09:47:34 2009 @@ -16,8 +16,11 @@ export PATH=/sbin:/usr/sbin:$PATH # allow for a different prefix -mydir=${0%/[YyZz]a[Ss][Tt]*} -if [[ -z "$mydir" || "$mydir" =~ ^/sbin/* ]]; then +# strip the basename off $0, which can be: (bnc#382216, bnc#458385) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +shopt -s extglob +mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} +if [[ -z "$mydir" || "$mydir" = /sbin ]]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} -- 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] r55198 - /branches/SuSE-Code-11-Branch/yast2/
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:36:18 2009 New Revision: 55198 URL: http://svn.opensuse.org/viewcvs/yast?rev=55198&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-54122" from http://svn.opensuse.org/svn/yast/trunk/yast2 Modified: branches/SuSE-Code-11-Branch/yast2/ (props changed) -- 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] r55197 - /trunk/yast2/package/yast2.changes
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:31:00 2009 New Revision: 55197 URL: http://svn.opensuse.org/viewcvs/yast?rev=55197&view=rev Log: changes Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 3 09:31:00 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 3 09:27:34 CET 2009 - mvidner(a)suse.cz + +- Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). + +------------------------------------------------------------------- Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz - fixed bash completion (bnc #470544) -- 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] r55196 - /trunk/yast2/scripts/yast2
by mvidner＠svn.opensuse.org 03 Feb '09

03 Feb '09

Author: mvidner Date: Tue Feb 3 09:26:15 2009 New Revision: 55196 URL: http://svn.opensuse.org/viewcvs/yast?rev=55196&view=rev Log: Fixed prefix detection if called "bash -x yast2" (bnc#458385 c12). Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=55196&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Feb 3 09:26:15 2009 @@ -16,8 +16,11 @@ export PATH=/sbin:/usr/sbin:$PATH # allow for a different prefix -mydir=${0%/[YyZz]a[Ss][Tt]*} -if [[ -z "$mydir" || "$mydir" =~ ^/sbin/* ]]; then +# strip the basename off $0, which can be: (bnc#382216, bnc#458385) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +shopt -s extglob +mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} +if [[ -z "$mydir" || "$mydir" = /sbin ]]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} -- 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] r55195 - /trunk/qt-graph/src/QY2Graph.h
by aschnell＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: aschnell Date: Mon Feb 2 21:10:09 2009 New Revision: 55195 URL: http://svn.opensuse.org/viewcvs/yast?rev=55195&view=rev Log: - added comment Modified: trunk/qt-graph/src/QY2Graph.h Modified: trunk/qt-graph/src/QY2Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.h?rev=5519… ============================================================================== --- trunk/qt-graph/src/QY2Graph.h (original) +++ trunk/qt-graph/src/QY2Graph.h Mon Feb 2 21:10:09 2009 @@ -30,6 +30,10 @@ #include <QPicture> +/** + * The QY2Graph widget shows a graph layouted by graphviz in a + * QGraphicsView/QGraphicsScene. + */ class QY2Graph : public QGraphicsView { Q_OBJECT -- 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] r55194 - in /trunk/installation: package/yast2-installation.changes src/modules/InstError.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 16:57:17 2009 New Revision: 55194 URL: http://svn.opensuse.org/viewcvs/yast?rev=55194&view=rev Log: - InstError can now save YaST logs on user request. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 16:57:17 2009 @@ -3,6 +3,7 @@ - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). +- InstError can now save YaST logs on user request. - 2.18.4 ------------------------------------------------------------------- Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Mon Feb 2 16:57:17 2009 @@ -16,9 +16,62 @@ import "Icon"; import "Label"; + import "String"; + import "Report"; + + boolean SaveLogs () { + map cmd = (map) WFM::Execute (.local.bash_output, "echo ${HOME}"); + string homedir = "/"; + + if (cmd["exit"]:-1 == 0) { + homedir = splitstring (cmd["stdout"]:"/", "\n")[0]:"/"; + if (homedir == "") homedir = "/"; + } else { + y2warning ("Unable to find out home dir: %1, using %2", cmd, homedir); + } + homedir = sformat ("%1/y2logs.tgz", homedir); + + string savelogsto = (string) UI::AskForSaveFileName ( + homedir, + "*.tgz *.tar.gz *.tar.bz2", + _("Save y2logs to...") + ); + + if (savelogsto == nil) + return nil; + + // Busy message, %1 is replaced with a filename + UI::OpenDialog (`Label (sformat (_("Saving YaST logs to %1..."), savelogsto))); + y2milestone ("Saving YaST logs to: %1", savelogsto); + + cmd = (map) WFM::Execute (.local.bash_output, sformat ("save_y2logs '%1'", String::Quote (savelogsto))); + boolean dialog_ret = nil; + + if (cmd["exit"]:-1 != 0) { + y2error ("Unable to save logs to %1", savelogsto); + + Report::Error (sformat ( + // Error message, %1 is replaced with a filename + // %2 with am error reason (there is a newline between %1 and %2) + _("Unable to save YaST logs to %1 +%2"), + savelogsto, + cmd["stderr"]:"" + )); + + dialog_ret = false; + } else { + y2milestone ("Logs have been saved to: %1", savelogsto); + dialog_ret = true; + } + + UI::CloseDialog(); + + return dialog_ret; + } global void ShowErrorPopUp (string heading, string error_text, string details) { - boolean success = UI::OpenDialog (`VBox ( + boolean success = (boolean) UI::OpenDialog (`VBox ( `Left (`HBox ( `HSquash (`MarginBox (0.5, 0.2, Icon::Error())), `Heading (heading) @@ -67,7 +120,17 @@ return; } - UI::UserInput(); + any uret = nil; + + while (true) { + uret = UI::UserInput(); + + if (uret == `save_y2logs) { + SaveLogs(); + } else { + break; + } + } UI::CloseDialog(); } -- 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] r55193 - in /branches/tmp/lslezak/core: dbus/namespace_service/ liby2dbus/src/
by lslezak＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: lslezak Date: Mon Feb 2 16:30:23 2009 New Revision: 55193 URL: http://svn.opensuse.org/viewcvs/yast?rev=55193&view=rev Log: - DBus service - added PolicyKit checks Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc branches/tmp/lslezak/core/liby2dbus/src/PolKit.h Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Mon Feb 2 16:30:23 2009 @@ -308,3 +308,26 @@ return reply; } + +std::string DBusModulesServer::createActionId(const DBusMsg &msg) +{ + // actionId: <prefix>.<namespace>.<method> + std::string ret("org.opensuse.yast.modules"); + + std::string obj(msg.path()); + + if (!obj.empty() && obj[0] == '/') + { + obj.erase(obj.begin()); + } + + ret += '.' + obj + '.' + msg.method(); + + if (!PolKit::isValidActionID(ret)) + { + ret = PolKit::makeValidActionID(ret); + } + + return ret; +} + Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Mon Feb 2 16:30:23 2009 @@ -31,6 +31,11 @@ virtual bool connect(); + protected: + + virtual std::string createActionId(const DBusMsg &msg); + + private: // the wrapped Yast namespaces Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Mon Feb 2 16:30:23 2009 @@ -28,7 +28,8 @@ // std::pair #include <utility> -static bool finish = false; +// use atomic type in signal handler +static sig_atomic_t finish = 0; DBusServerBase::DBusServerBase() { @@ -63,7 +64,7 @@ if (signal == SIGALRM) { // set the finish flag for the main loop - finish = true; + finish = 1; } } @@ -143,7 +144,7 @@ else { // reset the flag - finish = false; + finish = 0; // set a new timer resetTimer(); @@ -273,63 +274,70 @@ } else if (request.type() == DBUS_MESSAGE_TYPE_METHOD_CALL) { - // TODO check the policy - - // find the registered object - std::string objname = request.path(); - - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') + // check the policy using PolicyKit + if (isActionAllowed(request)) { - objname.erase(objname.begin()); - } + // find the registered object + std::string objname = request.path(); - // search the object - Objects::const_iterator i = registered_objects.find(objname); + // remove the slash at the beginning + if (objname.size() > 0 && objname[0] == '/') + { + objname.erase(objname.begin()); + } - bool found = false; + // search the object + Objects::const_iterator i = registered_objects.find(objname); - if (i != registered_objects.end()) - { - ObjectData::const_iterator ii = i->second.find(request.interface()); + bool found = false; - if (ii != i->second.end()) + if (i != registered_objects.end()) { - InterfaceData::const_iterator iii = ii->second.find(request.method()); + ObjectData::const_iterator ii = i->second.find(request.interface()); - if (iii != ii->second.end()) + if (ii != i->second.end()) { - MethodData md = iii->second; - methodHandler mh = md.first; + InterfaceData::const_iterator iii = ii->second.find(request.method()); + + if (iii != ii->second.end()) + { + MethodData md = iii->second; + methodHandler mh = md.first; - y2milestone("Evaluating method: object %s interface: %s, method: %s", - request.path().c_str(), request.interface().c_str(), request.method().c_str()); + y2milestone("Evaluating method: object %s interface: %s, method: %s", + request.path().c_str(), request.interface().c_str(), request.method().c_str()); - // call the registered callback - found = true; - reply = mh(request); + // call the registered callback + found = true; + reply = mh(request); + } + else + { + y2warning("Object %s does not provide method %s in interface %s", + objname.c_str(), request.path().c_str(), request.interface().c_str()); + } } else { - y2warning("Object %s does not provide method %s in interface %s", - objname.c_str(), request.path().c_str(), request.interface().c_str()); + y2warning("Object %s does not provide interface %s", + objname.c_str(), request.interface().c_str()); } } else { - y2warning("Object %s does not provide interface %s", - objname.c_str(), request.interface().c_str()); + y2warning("Object %s is not registered", objname.c_str()); + } + + if (!found) + { + // report error + reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); } } else { - y2warning("Object %s is not registered", objname.c_str()); - } - - if (!found) - { // report error - reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + reply.createError(request, "Access denied, check PolicyKit priviledges", DBUS_ERROR_ACCESS_DENIED); } } else if (request.type() == DBUS_MESSAGE_TYPE_ERROR) @@ -349,7 +357,7 @@ else if (request.type() == DBUS_MESSAGE_TYPE_SIGNAL) { // singals are not supported - y2error("Received a signal: interface: %s method: %s", request.interface().c_str(), request.method().c_str()); + y2warning("Ignoring a received signal: interface: %s method: %s", request.interface().c_str(), request.method().c_str()); } // was a reply set? @@ -362,9 +370,9 @@ } else { - y2milestone("Flushing connection..."); + y2debug("Flushing connection..."); connection.flush(); - y2milestone("...done"); + y2debug("...done"); } } @@ -442,21 +450,31 @@ } } } - -/* -#ifdef HAVE_POLKIT -bool DBusServerBase::isActionAllowed(const std::string &caller, const std::string &path, const std::string &method, - const std::string &arg, const std::string &opt) + +bool DBusServerBase::isActionAllowed(const DBusMsg &msg) { +#ifdef HAVE_POLKIT // create actionId - static const char *polkit_prefix = "org.opensuse.yast.scr"; - std::string action_id(PolKit::createActionId(polkit_prefix, path, method, arg, opt)); + std::string action_id(createActionId(msg)); + y2debug("PolicyKit check: action %s from %s", action_id.c_str(), msg.sender().c_str()); bool ret = false; + if (action_id.empty()) + { + // no actionId -> return the default (forbidden) + return ret; + } + + if (!PolKit::isValidActionID(action_id)) + { + y2error("Invalid action ID: %s", action_id.c_str()); + return ret; + } + // check the policy here - if (policykit.isDBusUserAuthorized(action_id, caller, connection.getConnection())) + if (policykit.isDBusUserAuthorized(action_id, msg.sender(), connection.getConnection())) { y2security("User is authorized to do action %s", action_id.c_str()); ret = true; @@ -467,13 +485,15 @@ } return ret; -} +#else + // no PolicyKit -> enable action + return true; #endif -*/ - +} std::string DBusServerBase::createActionId(const DBusMsg &msg) { - //TODO FIXME + // default implementation is empty string + // the inherited classes should redefine it return std::string(); } Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Mon Feb 2 16:30:23 2009 @@ -70,6 +70,7 @@ void resetTimer(); void registerSignalHandler(); bool canFinish(); + bool isActionAllowed(const DBusMsg &msg); typedef std::pair<methodHandler, DBusSignature> MethodData; typedef std::map<Method, MethodData> InterfaceData; Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc Mon Feb 2 16:30:23 2009 @@ -65,7 +65,7 @@ return pk_result == POLKIT_RESULT_YES; } -std::string makeValidActionID(const std::string &s) +std::string PolKit::makeValidActionID(const std::string &s) { if (s.empty()) return s; @@ -128,3 +128,9 @@ return action_id; } + +bool PolKit::isValidActionID(const std::string &action) +{ + return polkit_action_validate_id(action.c_str()); +} + Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.h Mon Feb 2 16:30:23 2009 @@ -25,6 +25,10 @@ const std::string &method, const std::string &arg = std::string(), const std::string &opt = std::string()); + static std::string makeValidActionID(const std::string &s); + + static bool isValidActionID(const std::string &action); + private: DBusError dbus_error; -- 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] r55192 - /trunk/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:13:21 2009 New Revision: 55192 URL: http://svn.opensuse.org/viewcvs/yast?rev=55192&view=rev Log: something for changelog Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Feb 2 15:13:21 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 2 15:11:27 CET 2009 - kmachalkova(a)suse.cz + +- Read/write Host::write_hostname variable by Host module only, + override in inst_hostname if applicable (bnc#469752) + +------------------------------------------------------------------- Thu Jan 29 11:59:48 CET 2009 - kmachalkova(a)suse.cz - Proxy finish popup is back - notify user about the need to relogin -- 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] r55191 - /tags/branch-Code-11-2_17_67/network/
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:04:44 2009 New Revision: 55191 URL: http://svn.opensuse.org/viewcvs/yast?rev=55191&view=rev Log: Created tag branch-Code-11-2_17_67 for network Added: tags/branch-Code-11-2_17_67/network/ - copied from r55190, branches/SuSE-Code-11-Branch/network/ -- 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] r55190 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/installation/inst_hostname.ycp src/modules/DNS.ycp src/modules/Host.ycp src/services/dns.ycp
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:04:37 2009 New Revision: 55190 URL: http://svn.opensuse.org/viewcvs/yast?rev=55190&view=rev Log: Read/write Host::write_hostname variable by Host module only, override in inst_hostname if applicable (bnc#469752) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp branches/SuSE-Code-11-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Mon Feb 2 15:04:37 2009 @@ -1 +1 @@ -2.17.66 +2.17.67 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Mon Feb 2 15:04:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 2 15:02:08 CET 2009 - kmachalkova(a)suse.cz + +- Read/write Host::write_hostname variable by Host module only, + override in inst_hostname if applicable (bnc#469752) +- 2.17.67 + +------------------------------------------------------------------- Wed Jan 21 09:38:33 CET 2009 - mzugec(a)suse.cz - fix mailformed NAME in ifcfg file when setup network via Linuxrc Modified: branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp Mon Feb 2 15:04:37 2009 @@ -31,9 +31,6 @@ // FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); y2milestone("write_hostname_to_hosts value from control.xml : %1", whth); -SCR::Write(.sysconfig.network.dhcp."WRITE_HOSTNAME_TO_HOSTS", whth ? "yes" : "no"); -SCR::Write(.sysconfig.network.dhcp, nil); - DNS::Read (); // handles NetworkConfig too @@ -45,6 +42,8 @@ // propose settings NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop (); +// override with setting from control.xml +Host::SetWriteHostname( whth ); // TODO: policy for proposing a hostname symbol ret = `next; Modified: branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp Mon Feb 2 15:04:37 2009 @@ -125,8 +125,12 @@ if(initialized == true) return true; - Host::Read(); + //in this order, because Host:;write hostname gets initialized from NetworkConfig::DHCP NetworkConfig::Read(); + Host::Read(); + + Host::SetWriteHostname( NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ); + y2milestone("write_hostname_to_hosts value from sysconfig : %1", NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true); /* install.inf from linuxrc */ map install_inf = $[]; @@ -208,18 +212,16 @@ //are defined for each static IP separately in address dialog //FaTE #2202 - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) - Host::write_hostname=false; - else - { + if (Host::WriteHostname()) { //Always add 127.0.0.2 entry to /etc/hosts, otherwise some //desktop apps may hang, not being able to resolve hostname (#304632) //empty list [] as third parameter does that - Host::Update(oldhostname, fqhostname, []); + Host::Update(oldhostname, fqhostname, []); Host::Write(); } oldhostname = fqhostname; // #49634 + NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname(); NetworkConfig::Write(); y2milestone("Writing configuration"); Modified: branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp Mon Feb 2 15:04:37 2009 @@ -13,6 +13,7 @@ textdomain "network"; import "Hostname"; +import "NetworkConfig"; import "String"; import "Summary"; @@ -31,7 +32,10 @@ */ global boolean modified = false; -global boolean write_hostname = true; +/** + * Should static hostname be written to /etc/hosts? + */ +boolean write_hostname = true; /** * All hosts read at the start @@ -50,6 +54,16 @@ boolean initialized = false; +global boolean WriteHostname() +{ + return write_hostname; +} + +global void SetWriteHostname( boolean w) +{ + write_hostname = w; +} + /** * Read hosts settings * @return true if success @@ -83,6 +97,7 @@ global define boolean Write() { y2milestone("Writing configuration"); + if(!modified) { y2milestone("No changes to Host -> nothing to write"); return true; @@ -94,7 +109,6 @@ return true; } - list <string> steps = [ _("Update /etc/hosts"), ]; Modified: branches/SuSE-Code-11-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/services/dns.ycp Mon Feb 2 15:04:37 2009 @@ -15,6 +15,7 @@ import "CWM"; import "DNS"; import "GetInstArgs"; +import "Host"; import "Hostname"; import "IP"; import "Label"; @@ -70,7 +71,7 @@ "DOMAIN": DNS::domain, "DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false, // set as true by default because there wasn't this option in previous version - "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true + "WRITE_HOSTNAME": Host::WriteHostname() ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -108,7 +109,7 @@ DNS::nameservers = NonEmpty (nameservers); DNS::searchlist = NonEmpty (searchlist); NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; - NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true; + Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true ); /* update modified flag */ DNS::modified = true; -- 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] r55189 - in /trunk/network/src: installation/inst_hostname.ycp modules/DNS.ycp modules/Host.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 14:58:15 2009 New Revision: 55189 URL: http://svn.opensuse.org/viewcvs/yast?rev=55189&view=rev Log: Read/write Host::write_hostname variable by Host module only, override in inst_hostname if applicable (bnc#469752) Modified: trunk/network/src/installation/inst_hostname.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Host.ycp trunk/network/src/services/dns.ycp Modified: trunk/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ho… ============================================================================== --- trunk/network/src/installation/inst_hostname.ycp (original) +++ trunk/network/src/installation/inst_hostname.ycp Mon Feb 2 14:58:15 2009 @@ -31,9 +31,6 @@ // FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); y2milestone("write_hostname_to_hosts value from control.xml : %1", whth); -SCR::Write(.sysconfig.network.dhcp."WRITE_HOSTNAME_TO_HOSTS", whth ? "yes" : "no"); -SCR::Write(.sysconfig.network.dhcp, nil); - DNS::Read (); // handles NetworkConfig too @@ -45,6 +42,8 @@ // propose settings NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop (); +// override with setting from control.xml +Host::SetWriteHostname( whth ); // TODO: policy for proposing a hostname symbol ret = `next; Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon Feb 2 14:58:15 2009 @@ -125,8 +125,12 @@ if(initialized == true) return true; - Host::Read(); + //in this order, because Host:;write hostname gets initialized from NetworkConfig::DHCP NetworkConfig::Read(); + Host::Read(); + + Host::SetWriteHostname( NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ); + y2milestone("write_hostname_to_hosts value from sysconfig : %1", NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true); /* install.inf from linuxrc */ map install_inf = $[]; @@ -208,18 +212,16 @@ //are defined for each static IP separately in address dialog //FaTE #2202 - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) - Host::write_hostname=false; - else - { + if (Host::WriteHostname()) { //Always add 127.0.0.2 entry to /etc/hosts, otherwise some //desktop apps may hang, not being able to resolve hostname (#304632) //empty list [] as third parameter does that - Host::Update(oldhostname, fqhostname, []); + Host::Update(oldhostname, fqhostname, []); Host::Write(); } oldhostname = fqhostname; // #49634 + NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname(); NetworkConfig::Write(); y2milestone("Writing configuration"); Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev… ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Mon Feb 2 14:58:15 2009 @@ -13,6 +13,7 @@ textdomain "network"; import "Hostname"; +import "NetworkConfig"; import "String"; import "Summary"; @@ -31,7 +32,10 @@ */ global boolean modified = false; -global boolean write_hostname = true; +/** + * Should static hostname be written to /etc/hosts? + */ +boolean write_hostname = true; /** * All hosts read at the start @@ -50,6 +54,16 @@ boolean initialized = false; +global boolean WriteHostname() +{ + return write_hostname; +} + +global void SetWriteHostname( boolean w) +{ + write_hostname = w; +} + /** * Read hosts settings * @return true if success @@ -83,6 +97,7 @@ global define boolean Write() { y2milestone("Writing configuration"); + if(!modified) { y2milestone("No changes to Host -> nothing to write"); return true; @@ -94,7 +109,6 @@ return true; } - list <string> steps = [ _("Update /etc/hosts"), ]; Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Mon Feb 2 14:58:15 2009 @@ -15,6 +15,7 @@ import "CWM"; import "DNS"; import "GetInstArgs"; +import "Host"; import "Hostname"; import "IP"; import "Label"; @@ -70,7 +71,7 @@ "DOMAIN": DNS::domain, "DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false, // set as true by default because there wasn't this option in previous version - "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true + "WRITE_HOSTNAME": Host::WriteHostname() ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -108,7 +109,7 @@ DNS::nameservers = NonEmpty (nameservers); DNS::searchlist = NonEmpty (searchlist); NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; - NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true; + Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true ); /* update modified flag */ DNS::modified = true; -- 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] r55188 - /tags/stable-2_18_2/add-on/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:53:28 2009 New Revision: 55188 URL: http://svn.opensuse.org/viewcvs/yast?rev=55188&view=rev Log: Created tag stable-2_18_2 for add-on Added: tags/stable-2_18_2/add-on/ - copied from r55187, trunk/add-on/ -- 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] r55187 - in /trunk/qt-graph: examples/colors.dot src/QY2Graph.cc
by aschnell＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: aschnell Date: Mon Feb 2 14:49:37 2009 New Revision: 55187 URL: http://svn.opensuse.org/viewcvs/yast?rev=55187&view=rev Log: - support background color Modified: trunk/qt-graph/examples/colors.dot trunk/qt-graph/src/QY2Graph.cc Modified: trunk/qt-graph/examples/colors.dot URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/examples/colors.dot?rev… ============================================================================== --- trunk/qt-graph/examples/colors.dot (original) +++ trunk/qt-graph/examples/colors.dot Mon Feb 2 14:49:37 2009 @@ -1,5 +1,6 @@ digraph { + graph [bgcolor="#eeeeff"]; node [style="filled"]; A; Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=551… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Mon Feb 2 14:49:37 2009 @@ -328,6 +328,8 @@ scene->setSceneRect(rect.adjusted(-5, -5, +5, +5)); size = rect.size(); + scene->setBackgroundBrush(aggetToQColor(graph, "bgcolor", Qt::white)); + for (node_t* node = agfstnode(graph); node != NULL; node = agnxtnode(graph, node)) { QPicture picture; -- 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] r55186 - /tags/branch-Code-11-2_17_17/add-on/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:44:16 2009 New Revision: 55186 URL: http://svn.opensuse.org/viewcvs/yast?rev=55186&view=rev Log: Created tag branch-Code-11-2_17_17 for add-on Added: tags/branch-Code-11-2_17_17/add-on/ - copied from r55185, branches/SuSE-Code-11-Branch/add-on/ -- 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] r55185 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:43:27 2009 New Revision: 55185 URL: http://svn.opensuse.org/viewcvs/yast?rev=55185&view=rev Log: - Forcing recreating and redrawing the table of add-on products. - Opening new wizard window before calling inst_rpmcopy and closing after it returns. - Adding more debugging messages (all bnc #471020). - 2.18.2 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=55185&r1=5518… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Mon Feb 2 14:43:27 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Mon Feb 2 14:43:27 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz + +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.18.2 + +------------------------------------------------------------------- Mon Jan 26 16:51:09 CET 2009 - locilka(a)suse.cz - Added new client inst_add-on_software providing the functionality Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Mon Feb 2 14:43:27 2009 @@ -1274,9 +1274,13 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { + Wizard::OpenNextBackDialog(); + y2milestone ("Calling inst_rpmcopy"); WFM::call ("inst_rpmcopy"); y2milestone ("Done"); + + Wizard::CloseDialog(); } return true; @@ -1446,28 +1450,51 @@ while (true) { userret = UI::UserInput(); + // Abort if (userret == `abort || userret == `cancel) { + y2warning ("Aborting..."); ret = `abort; break; + + // Closing } else if (userret == `next || userret == `finish) { + y2milestone ("Finishing..."); ret = `next; break; + + // Addin new product } else if (userret == `add) { + y2milestone ("Using new Add-On..."); + if (RunWizard() == `next) { RunAddProductWorkflow(); } CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); + + // Removing product } else if (userret == `delete) { + y2milestone ("Removing selected product..."); + if (RemoveProductWithDependencies()) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } + + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); + + // Calling packager directly } else if (userret == `packager) { + y2milestone ("Calling packager..."); RunPackageSelector(); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + // Everything else } else { y2error ("Uknown ret: %1", userret); } -- 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] r55184 - in /branches/SuSE-Code-11-Branch/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:43:08 2009 New Revision: 55184 URL: http://svn.opensuse.org/viewcvs/yast?rev=55184&view=rev Log: - Forcing recreating and redrawing the table of add-on products. - Opening new wizard window before calling inst_rpmcopy and closing after it returns. - Adding more debugging messages (all bnc #471020). - 2.17.17 Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Mon Feb 2 14:43:08 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Mon Feb 2 14:43:08 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz + +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.17.17 + +------------------------------------------------------------------- Mon Jan 26 16:51:09 CET 2009 - locilka(a)suse.cz - Added new client inst_add-on_software providing the functionality Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Mon Feb 2 14:43:08 2009 @@ -1274,9 +1274,13 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { + Wizard::OpenNextBackDialog(); + y2milestone ("Calling inst_rpmcopy"); WFM::call ("inst_rpmcopy"); y2milestone ("Done"); + + Wizard::CloseDialog(); } return true; @@ -1446,28 +1450,51 @@ while (true) { userret = UI::UserInput(); + // Abort if (userret == `abort || userret == `cancel) { + y2warning ("Aborting..."); ret = `abort; break; + + // Closing } else if (userret == `next || userret == `finish) { + y2milestone ("Finishing..."); ret = `next; break; + + // Addin new product } else if (userret == `add) { + y2milestone ("Using new Add-On..."); + if (RunWizard() == `next) { RunAddProductWorkflow(); } CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); + + // Removing product } else if (userret == `delete) { + y2milestone ("Removing selected product..."); + if (RemoveProductWithDependencies()) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } + + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); + + // Calling packager directly } else if (userret == `packager) { + y2milestone ("Calling packager..."); RunPackageSelector(); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + // Everything else } else { y2error ("Uknown ret: %1", userret); } -- 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] r55183 - in /trunk/control-center-gnome: ChangeLog src/control-center.c
by vuntz＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: vuntz Date: Mon Feb 2 13:52:44 2009 New Revision: 55183 URL: http://svn.opensuse.org/viewcvs/yast?rev=55183&view=rev Log: 2009-01-31 Vincent Untz <vuntz(a)gnome.org> * src/control-center.c: (main): force not using the default handler for gconf errors. libgnomeui sets one, and when a program is run under "su" (not "su -"), we get gconf errors. And this program is often run under "su", it seems :-) Modified: trunk/control-center-gnome/ChangeLog trunk/control-center-gnome/src/control-center.c Modified: trunk/control-center-gnome/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/ChangeLog?r… ============================================================================== --- trunk/control-center-gnome/ChangeLog (original) +++ trunk/control-center-gnome/ChangeLog Mon Feb 2 13:52:44 2009 @@ -1,3 +1,10 @@ +2009-01-31 Vincent Untz <vuntz(a)gnome.org> + + * src/control-center.c: (main): force not using the default handler for + gconf errors. libgnomeui sets one, and when a program is run under "su" + (not "su -"), we get gconf errors. And this program is often run under + "su", it seems :-) + 2008-05-12 Michael Meeks <michael.meeks(a)novell.com> * Version 2.13.3 Modified: trunk/control-center-gnome/src/control-center.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/src/control… ============================================================================== --- trunk/control-center-gnome/src/control-center.c (original) +++ trunk/control-center-gnome/src/control-center.c Mon Feb 2 13:52:44 2009 @@ -21,6 +21,7 @@ #define ENABLE_NLS 1 #include "config.h" #include <string.h> +#include <gconf/gconf-client.h> #include <gtk/gtkicontheme.h> #include <libgnome/gnome-desktop-item.h> #include <libgnomeui/libgnomeui.h> @@ -114,6 +115,7 @@ AppShellData *app_data; GSList *actions; GnomeProgram *program; + GConfClient *client; const gchar *widget_theming_name = "y2ccg-control-center"; //Fixme - do not hardcode the path - generate and -D it in the Makefile @@ -134,6 +136,17 @@ } } + /* Make gconf not handle the errors by default: libgnomeui installs an + * handler that creates a dialog to display the error. Since this + * application is mainly used as root, and since it can't connect to + * gconf when "su" (not "su -") is used, we will likely get gconf + * errors, and we want to ignore them. + * Also, keep a reference to the default gconf client we created to + * make sure this property kept set. */ + g_type_init (); + client = gconf_client_get_default (); + gconf_client_set_error_handling (client, GCONF_CLIENT_HANDLE_NONE); + startup_id = g_strdup (g_getenv (DESKTOP_STARTUP_ID)); program = gnome_program_init ("YaST2 GNOME Control Center", "0.1", LIBGNOMEUI_MODULE, argc, argv, NULL, NULL); @@ -168,5 +181,7 @@ bonobo_object_unref (bonobo_app); bonobo_debug_shutdown (); g_free (startup_id); + g_object_unref (client); + return 0; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55182 - /tags/branch-Code-11-2_17_51/installation/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:14:40 2009 New Revision: 55182 URL: http://svn.opensuse.org/viewcvs/yast?rev=55182&view=rev Log: Created tag branch-Code-11-2_17_51 for installation Added: tags/branch-Code-11-2_17_51/installation/ - copied from r55181, branches/SuSE-Code-11-Branch/installation/ -- 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] r55181 - in /branches/SuSE-Code-11-Branch/installation: VERSION package/yast2-installation.changes src/clients/copy_files_finish.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:13:44 2009 New Revision: 55181 URL: http://svn.opensuse.org/viewcvs/yast?rev=55181&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). - 2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/VERSION branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-Code-11-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/installation/VERSION Mon Feb 2 13:13:44 2009 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Mon Feb 2 13:13:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka(a)suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). +- 2.17.51 + +------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka(a)suse.cz - Disabling [Back] buttons in the very first interactive dialogs Modified: branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Mon Feb 2 13:13:44 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); -- 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] r55180 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:13:19 2009 New Revision: 55180 URL: http://svn.opensuse.org/viewcvs/yast?rev=55180&view=rev Log: 2.18.4 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=55180&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Feb 2 13:13:19 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 13:13:19 2009 @@ -3,6 +3,7 @@ - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). +- 2.18.4 ------------------------------------------------------------------- Wed Jan 28 14:33:09 CET 2009 - locilka(a)suse.cz -- 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] r55179 - in /trunk/installation: package/yast2-installation.changes src/inst_finish/copy_files_finish.ycp src/modules/InstError.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:12:35 2009 New Revision: 55179 URL: http://svn.opensuse.org/viewcvs/yast?rev=55179&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/copy_files_finish.ycp trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 13:12:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka(a)suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). + +------------------------------------------------------------------- Wed Jan 28 14:33:09 CET 2009 - locilka(a)suse.cz - Added new InstError module for unified reporting of errors Modified: trunk/installation/src/inst_finish/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/cop… ============================================================================== --- trunk/installation/src/inst_finish/copy_files_finish.ycp (original) +++ trunk/installation/src/inst_finish/copy_files_finish.ycp Mon Feb 2 13:12:35 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Mon Feb 2 13:12:35 2009 @@ -55,7 +55,11 @@ ))) ) ), - `ButtonBox (`PushButton (`id(`ok), Label::OKButton())) + `ButtonBox ( + // FIXME: BNC #422612, Use `opt(`noSanityCheck) later + `PushButton (`id(`save_y2logs), `opt(`cancelButton), _("&Save YaST Logs...")), + `PushButton (`id(`ok), Label::OKButton()) + ) )); if (success != true) { -- 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] r55178 - /trunk/audit-laf/package/yast2-audit-laf.changes
by gs＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: gs Date: Mon Feb 2 12:02:55 2009 New Revision: 55178 URL: http://svn.opensuse.org/viewcvs/yast?rev=55178&view=rev Log: Correct behaviour on "Abort" (bnc #458327) Modified: trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Mon Feb 2 12:02:55 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 2 12:01:33 CET 2009 - gs(a)suse.de + +- Correct behaviour on "Abort" (bnc #458327) + +------------------------------------------------------------------- Wed Jan 21 11:51:56 CET 2009 - gs(a)suse.de - Localize message "Success" (bnc #447169) -- 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] r55177 - in /trunk/audit-laf/src: complex.ycp wizards.ycp
by gs＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: gs Date: Mon Feb 2 12:01:20 2009 New Revision: 55177 URL: http://svn.opensuse.org/viewcvs/yast?rev=55177&view=rev Log: correct use of ReallyAbort popup Modified: trunk/audit-laf/src/complex.ycp trunk/audit-laf/src/wizards.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Mon Feb 2 12:01:20 2009 @@ -50,16 +50,9 @@ } boolean ReallyAbort() { - return !AuditLaf::Modified() || Popup::ReallyAbort(true); + return Popup::ReallyAbort(AuditLaf::Modified()); } -boolean ReallyExit () { - // yes-no popup - return Popup::YesNo (_("Really exit? -All changes will be lost.")); -} - - /** * Read settings dialog * @return `abort if aborted and `next otherwise Modified: trunk/audit-laf/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/wizards.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/wizards.ycp (original) +++ trunk/audit-laf/src/wizards.ycp Mon Feb 2 12:01:20 2009 @@ -141,7 +141,7 @@ Wizard::DisableBackButton (); Wizard::SetTitleIcon("yast-audit-laf"); - return CWM::Run (w, $[`abort : ReallyExit]); + return CWM::Run (w, $[`abort : ReallyAbort]); } /** -- 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] r55176 - in /trunk: core/agent-dbus/conf/ core/agent-dbus/src/ storage/storage/src/modules/
by aschnell＠svn.opensuse.org 01 Feb '09

01 Feb '09

Author: aschnell Date: Sun Feb 1 20:51:49 2009 New Revision: 55176 URL: http://svn.opensuse.org/viewcvs/yast?rev=55176&view=rev Log: - make dbus session bus also available Added: trunk/core/agent-dbus/conf/dbus.session.scr trunk/core/agent-dbus/conf/dbus.system.scr (contents, props changed) - copied, changed from r55173, trunk/core/agent-dbus/conf/dbus.scr Removed: trunk/core/agent-dbus/conf/dbus.scr Modified: trunk/core/agent-dbus/conf/Makefile.am trunk/core/agent-dbus/src/DbusAgent.cc trunk/core/agent-dbus/src/DbusAgent.h trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/core/agent-dbus/conf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/Makefile.am… ============================================================================== --- trunk/core/agent-dbus/conf/Makefile.am (original) +++ trunk/core/agent-dbus/conf/Makefile.am Sun Feb 1 20:51:49 2009 @@ -2,6 +2,6 @@ # Makefile.am for core/agent-dbus/conf # -scrconf_DATA = dbus.scr +scrconf_DATA = dbus.system.scr dbus.session.scr EXTRA_DIST = $(scrconf_DATA) Added: trunk/core/agent-dbus/conf/dbus.session.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/dbus.sessio… ============================================================================== --- trunk/core/agent-dbus/conf/dbus.session.scr (added) +++ trunk/core/agent-dbus/conf/dbus.session.scr Sun Feb 1 20:51:49 2009 @@ -0,0 +1,11 @@ +/** + * File: + * dbus.session.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus.session + +`ag_dbus( + `Bus("session") +) Copied: trunk/core/agent-dbus/conf/dbus.system.scr (from r55173, trunk/core/agent-dbus/conf/dbus.scr) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/dbus.system… ============================================================================== --- trunk/core/agent-dbus/conf/dbus.scr (original) +++ trunk/core/agent-dbus/conf/dbus.system.scr Sun Feb 1 20:51:49 2009 @@ -1,9 +1,11 @@ /** * File: - * dbus.scr + * dbus.system.scr * Authors: * Arvin Schnell <aschnell(a)suse.de> */ -.dbus +.dbus.system -`ag_dbus() +`ag_dbus( + `Bus("system") +) Modified: trunk/core/agent-dbus/src/DbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.cc… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.cc (original) +++ trunk/core/agent-dbus/src/DbusAgent.cc Sun Feb 1 20:51:49 2009 @@ -13,22 +13,9 @@ DbusAgent::DbusAgent() + : connection(NULL) { - y2milestone("connecting dbus"); - dbus_error_init(&error); - - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (dbus_error_is_set(&error)) - { - y2error("dbus_bus_get failed (%s)\n", error.message); - dbus_error_free(&error); - } - - if (connection == NULL) - { - y2error("connecting dbus failed"); - } } @@ -185,3 +172,49 @@ return YCPError(string("Undefined subpath for Execute(") + path->toString() + ")"); } + + +YCPValue +DbusAgent::otherCommand(const YCPTerm& term) +{ + string sym = term->name(); + + if (sym == "Bus") + { + if (term->size() != 1 || !term->value(0)->isString()) + { + return YCPError("Bad number of arguments. Expecting Bus (\"type\")"); + } + + string bus = term->value(0)->asString()->value(); + if (bus == "system") + connect(DBUS_BUS_SYSTEM); + else if (bus == "session") + connect(DBUS_BUS_SESSION); + else + return YCPError("Unknown bus"); + + return YCPBoolean(true); + } + + return YCPNull(); +} + + +void +DbusAgent::connect(DBusBusType type) +{ + y2milestone("connecting dbus"); + + connection = dbus_bus_get(type, &error); + if (dbus_error_is_set(&error)) + { + y2error("dbus_bus_get() failed (%s)", error.message); + dbus_error_free(&error); + } + + if (connection == NULL) + { + y2error("connecting dbus failed"); + } +} Modified: trunk/core/agent-dbus/src/DbusAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.h?… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.h (original) +++ trunk/core/agent-dbus/src/DbusAgent.h Sun Feb 1 20:51:49 2009 @@ -52,8 +52,15 @@ */ virtual YCPList Dir(const YCPPath& path) { return YCPList(); } + /** + * Used for mounting the agent. + */ + virtual YCPValue otherCommand(const YCPTerm& term); + private: + void connect(DBusBusType type); + DBusConnection* connection; DBusError error; 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 Sun Feb 1 20:51:49 2009 @@ -6383,7 +6383,7 @@ if (!on) { - SCR::Execute(.dbus.method, + SCR::Execute(.dbus.system.method, $[ `destination : "org.freedesktop.Hal", `path : "/org/freedesktop/Hal/Manager", `interface : "org.freedesktop.Hal.Manager", @@ -6393,7 +6393,7 @@ } else { - SCR::Execute(.dbus.method, + SCR::Execute(.dbus.system.method, $[ `destination : "org.freedesktop.Hal", `path : "/org/freedesktop/Hal/Manager", `interface : "org.freedesktop.Hal.Manager", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0