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 + _("<p>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<br /> -<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<br /> +<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...) +/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre> </p>"); } -- 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