December 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r53792 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/online_update_configuration.ycp
by jdsn＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: jdsn Date: Mon Dec 1 19:09:51 2008 New Revision: 53792 URL: http://svn.opensuse.org/viewcvs/yast?rev=53792&view=rev Log: fix detection of base product (bnc#449844) 2.17.17 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/online_update_configuration.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=53792&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Mon Dec 1 19:09:51 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Mon Dec 1 19:09:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 1 18:21:35 CET 2008 - jdsn(a)suse.de + +- fix detection of base product (bnc#449844) +- 2.17.17 + +------------------------------------------------------------------- Thu Nov 27 21:08:07 CET 2008 - jdsn(a)suse.de - fix restoring the default update repository (bnc#444301) Modified: trunk/registration/src/clients/online_update_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/online_… ============================================================================== --- trunk/registration/src/clients/online_update_configuration.ycp (original) +++ trunk/registration/src/clients/online_update_configuration.ycp Mon Dec 1 19:09:51 2008 @@ -21,6 +21,7 @@ import "SourceManager"; import "PackageCallbacks"; import "CommandLine"; + import "Installation"; include "registration/OUCDialogs.ycp"; include "registration/texts.ycp"; @@ -50,6 +51,8 @@ /* --------------------------------------------------------------------------------------------------------------- */ Pkg::SourceStartManager(true); + string targetRootDir = Mode::normal() ? "/":Installation::destdir; + Pkg::TargetInit(targetRootDir, false); // (bnc#449844) // check if we are in installation workflow or running independently if (Mode::normal()) Wizard::CreateDialog(); -- 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] r53791 - /tags/stable-2_17_44/bootloader/
by juhliarik＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: juhliarik Date: Mon Dec 1 18:27:27 2008 New Revision: 53791 URL: http://svn.opensuse.org/viewcvs/yast?rev=53791&view=rev Log: Created tag stable-2_17_44 for bootloader Added: tags/stable-2_17_44/bootloader/ - copied from r53790, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r53790 - in /trunk/bootloader: ./ package/ src/grub/ src/modules/ src/routines/
by juhliarik＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: juhliarik Date: Mon Dec 1 18:27:06 2008 New Revision: 53790 URL: http://svn.opensuse.org/viewcvs/yast?rev=53790&view=rev Log: new version 2.17.44 - fixed problem with multipath - fixed problem with Vista MBR (proposal) - fixed problem with cloning section Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/modules/Bootloader_API.pm trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/src/routines/section_widgets.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=53790&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Mon Dec 1 18:27:06 2008 @@ -1 +1 @@ -2.17.43 +2.17.44 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Dec 1 18:27:06 2008 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Dec 1 16:07:54 CET 2008 - juhliarik(a)suse.cz + +- added fix for proposal if MBR include Vista code and "/" is on + logical partition (bnc #450137) +- added update of handling serial console (bnc #449726) +- 2.17.44 + +------------------------------------------------------------------- +Mon Dec 1 14:32:09 CET 2008 - juhliarik(a)suse.cz + +- added fix for problem with multipath (bnc #448110) +- added fix for problem with cloning boot sections (bnc #450190) + +------------------------------------------------------------------- Thu Nov 27 18:55:11 CET 2008 - juhliarik(a)suse.cz - added fix for problem with missing "console" (bnc #449726) Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon Dec 1 18:27:06 2008 @@ -534,6 +534,7 @@ // variable is not used for grub anymore symbol selected_location = `mbr; // default to mbr + boolean vista_mbr = false; // check whether the /boot partition // - is primary: is_logical -> false // - is on the first disk (with the MBR): boot_partition_is_on_mbr_disk -> true @@ -622,8 +623,13 @@ map out = (map)SCR::Execute (.target.bash_output, sformat ( "/usr/lib/YaST2/bin/examine_mbr.pl %1", boot_partition_disk)); y2milestone ("MBR examining script returned %1", out); - exit = out["exit"]:0; + exit = out["exit"]:0; BootCommon::globals["generic_mbr"] = ((exit == 254) && (! keep_mbr)) ? "true" : "false"; + if (exit == 0) + { + y2milestone("Vista MBR..."); + vista_mbr = true; + } } @@ -679,7 +685,8 @@ // kokso: fix the problem with proposing installation generic boot code to "/" or "/boot" // kokso: if boot device is on logical partition - if (is_logical && extended != nil && BootCommon::globals["generic_mbr"]:"" == "true") + if (is_logical && extended != nil && (BootCommon::globals["generic_mbr"]:"" == "true" || + vista_mbr)) selected_location = `extended; BootCommon::globals["activate"] = "true"; SetBootloaderDevice(selected_location); 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 Mon Dec 1 18:27:06 2008 @@ -78,6 +78,18 @@ global map<string,string> device_mapping = $[]; /** + * device mapping between real devices and multipath + */ +global map<string,string> multipath_mapping = $[]; + +/** + * Flag indicates that bios_id_missing in disk + * true if missing false if at least one disk has bios_id + */ + +global boolean bois_id_missing = true; + +/** * device to save loader stage 1 to * NOTE: this variable is being phased out. The boot_* keys in the globals map * are now used to remember the selected boot location. Thus, we now have a @@ -356,7 +368,7 @@ global define list<string> Summary (); global define boolean UsingXenPae(); global map<string,any> CreateLinuxSection (string title); - +global string UpdateSerialConsole (string append, string console); // // FIXME: the select and selectdevice seem to be broken: the default value of // the widget description string needs to be patched with the current value of @@ -861,12 +873,14 @@ // convert device names in device map to the device names indicated by // "mountby" + + y2milestone ("device map before mapping %1", device_mapping); map<string,string> my_device_mapping = mapmap (string k , string v, device_mapping, { //return $[BootCommon::Dev2MountByDev(k) : v]; return $[BootCommon::Dev2MountByDev(k) : v]; }); - + y2milestone ("device map after mapping %1", my_device_mapping); if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) globals = remove(globals, "gfxmenu"); @@ -874,6 +888,7 @@ // bnc #436899 ConvertXENinDomU (); + ret = ret && DefineMultipath(multipath_mapping); ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); ret = ret && SetGlobal (my_globals); Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Mon Dec 1 18:27:06 2008 @@ -471,6 +471,7 @@ s["image"] = additional["image"]:""; if (haskey (additional, "initrd")) s["initrd"] = additional["initrd"]:""; + s["original_name"] = "linux"; out = add (out, s); }); } Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Mon Dec 1 18:27:06 2008 @@ -92,7 +92,7 @@ */ boolean checkElilo() { - string cmd = "modprobe efivars"; + string cmd = "modprobe efivars 2>/dev/null"; map ret = (map)SCR::Execute (.target.bash_output, cmd); if (ret["exit"]:1 == 0) return true; @@ -223,7 +223,23 @@ return result; } +/** + * Check if there is bios_id + * if not show warning + * + * @return boolean true on success + */ +boolean CheckBios_ID() +{ + boolean ret = true; + if (BootCommon::bois_id_missing) + { + AddNewProblem (_("It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"")); + ret = false; + } + return ret; +} /** @@ -240,6 +256,8 @@ boolean ret = GptPartitionTable (); if (ret) ret = check_BootDevice(); + if (ret) + ret = CheckBios_ID(); return ret; } Modified: trunk/bootloader/src/modules/Bootloader_API.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader_API.pm (original) +++ trunk/bootloader/src/modules/Bootloader_API.pm Mon Dec 1 18:27:06 2008 @@ -156,6 +156,15 @@ return $ret; } +BEGIN { $TYPEINFO{defineMultipath} = ["function", "boolean", ["map", "string", "string"]]; } +sub defineMultipath($) { + my ($dm) = @_; + + my $ret = $lib_ref->DefineMultipath ($dm); + DumpLog(); + return $ret; +} + BEGIN { $TYPEINFO{getGlobalSettings} = ["function", ["map", "string", "string"]]; } sub getGlobalSettings() { my %globalsettings = %{$lib_ref->GetGlobalSettings () || {}}; Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_ifac… ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Mon Dec 1 18:27:06 2008 @@ -34,6 +34,11 @@ string library_initialized = nil; /** + * Declarations... + */ +global boolean DefineMultipath(map<string,string> multipath_map); + +/** * Retrieve the data for perl-Bootloader library from Storage module * and pass it along * @return nothing @@ -41,8 +46,11 @@ // FIXME: this should be done directly in perl-Bootloader through LibStorage.pm global void SetDiskInfo () { map<string,list<string> > md_info = $[]; + map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); + multipath_mapping = $[]; + multipath_mapping = BootCommon::mapRealDevicesToMultipath(); map<string,any> mountpoints = mapmap (string k, list v, (map<string,list>)Storage::GetMountPoints (), { @@ -123,10 +131,12 @@ y2milestone ("Information about partitioning: %1", partinfo); y2milestone ("Information about MD arrays: %1", md_info); + y2milestone ("Mapping real disk to multipath: %1", multipath_mapping); System::Bootloader_API::setMountPoints ((map<string,string>) mountpoints); System::Bootloader_API::setPartitions ((list<list<string> >) partinfo); System::Bootloader_API::setMDArrays ((map<string,list<string> >) md_info); + DefineMultipath(multipath_mapping); } /** @@ -255,6 +265,25 @@ } /** + * Set the mapping (real device <-> multipath) + * @param map<string,string> map from real device to multipath device + * @return boolean true on success + */ +global boolean DefineMultipath(map<string,string> multipath_map) { + y2milestone ("Storing multipath map: %1", multipath_map); + if (size(multipath_map) == 0) + { + y2milestone("Multipath was not detected"); + return true; + } + boolean ret = System::Bootloader_API::defineMultipath (multipath_map); + if (! ret) + y2error ("Storing multipath map failed"); + return ret; +} + + +/** * Get the device mapping (Linux <-> Firmware) * @return a map from Linux device to Firmware device identification */ Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Mon Dec 1 18:27:06 2008 @@ -1330,7 +1330,7 @@ list<string> usb_disks = []; // contains those usb removable disks device_mapping = $[]; - + multipath_mapping = $[]; map<string,map> targetMap = $[]; if (Mode::config ()) y2milestone ("Skipping device map proposing in Config mode"); @@ -1405,10 +1405,16 @@ changeOrderInDeviceMapping(usb_disks); } + if (size(device_mapping) == 1) + bois_id_missing = false; if (StorageDevices::FloppyPresent()) device_mapping[StorageDevices::FloppyDevice()] = "fd0"; y2milestone ("Detected device mapping: %1", device_mapping); + + multipath_mapping = BootCommon::mapRealDevicesToMultipath(); + + y2milestone ("Detected multipath mapping: %1", multipath_mapping); } /** 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 Mon Dec 1 18:27:06 2008 @@ -2486,7 +2486,6 @@ return ret; } - /** FATE #110038: Serial console * Add console arg for kernel if there is defined serial console * - add key console with value to section type image and xen @@ -2516,6 +2515,16 @@ { sections[idx, "console"] = console_value; sections[idx, "__changed"] = true; + if (sections[idx, "append"]:"" != "") + { + string updated_append = + BootCommon::UpdateSerialConsole(sections[idx,"append"]:"", + sections[idx,"console"]:""); + if (updated_append != nil) + { + sections[idx,"append"]=updated_append; + } + } y2debug("Added console for section: %1", sections[idx]:$[]); }); } @@ -2523,5 +2532,42 @@ } } +/** bnc #447591, 438243, 448110 multipath wrong device map + * Function maps real devices to multipath e.g. + * "/dev/sda/" : "/dev/mapper/SATA_ST3120813AS_3LS0CD7M" + * + * @return map <string, string> mapping real disk to multipath + */ + +map <string, string> mapRealDevicesToMultipath() +{ + map <string, string> ret = $[]; + map<string, map> tm = (map<string,map>)Storage::GetTargetMap (); + integer num_of_real_disk = 0; + foreach (string disk, map disk_info, tm, + { + if (disk_info["type"]:nil == `CT_DMMULTIPATH) + { + list <string> devices = (list <string>) disk_info["devices"]:[]; + if (size(devices) > 0) + { + foreach(string d, devices, + { + ret[d]=disk; + }); + + } + } + + if (disk_info["type"]:nil == `CT_DISK) + num_of_real_disk = num_of_real_disk +1; + if (disk_info["bios_id"]:nil != nil) + bois_id_missing = false; + }); + if (num_of_real_disk == 1) + bois_id_missing = false; + return ret; +} + } //end of include Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Mon Dec 1 18:27:06 2008 @@ -322,7 +322,9 @@ // it seems be correct if original_name stay same... // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; - BootCommon::current_section["lines_cache_id"] = ""; + // fix for problem with cloning section + if (haskey(BootCommon::current_section,"lines_cache_id")) + BootCommon::current_section = remove(BootCommon::current_section, "lines_cache_id"); } y2milestone ("Added section template: %1", BootCommon::current_section); return nil; -- 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] r53789 - in /trunk/gtk: ChangeLog src/YGUtils.cc src/YGUtils.h src/YGWizard.cc src/test.cc src/ygtkrichtext.c src/ygtkrichtext.h src/ygtkwizard.c
by michael_meeks＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: michael_meeks Date: Mon Dec 1 18:15:36 2008 New Revision: 53789 URL: http://svn.opensuse.org/viewcvs/yast?rev=53789&view=rev Log: 2008-12-01 Michael Meeks <michael.meeks(a)novell.com> fix: #446064 - lots of code movement, regression tests and little underlying change: * src/test.cc (testHeaderize): impl. with some real regression * tests. * src/YGWizard.cc (YGWidget): do product substitution here. * src/ygtkrichtext.c: move convert_to_xhtml into * src/YGUtils.cc (ygutils_convert_to_xhtml): here. (ygutils_headerize_help): convert to xhtml first. * src/ygtkwizard.c (ygtk_wizard_header_set_description): split * out to: * src/YGUtils.cc (ygutils_headerize_help): here. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/YGWizard.cc trunk/gtk/src/test.cc trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkrichtext.h trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53789&r1=53788… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Dec 1 18:15:36 2008 @@ -1,5 +1,21 @@ 2008-12-01 Michael Meeks <michael.meeks(a)novell.com> + fix: #446064 - lots of code movement, regression tests and little + underlying change: + + * src/test.cc (testHeaderize): impl. with some real regression tests. + + * src/YGWizard.cc (YGWidget): do product substitution here. + + * src/ygtkrichtext.c: move convert_to_xhtml into + * src/YGUtils.cc (ygutils_convert_to_xhtml): here. + (ygutils_headerize_help): convert to xhtml first. + + * src/ygtkwizard.c (ygtk_wizard_header_set_description): split out to: + * src/YGUtils.cc (ygutils_headerize_help): here. + +2008-12-01 Michael Meeks <michael.meeks(a)novell.com> + * src/YGWidget.cc (doSetLabel): cope with unicode colon too: 449385 2008-11-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=53789&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Dec 1 18:15:36 2008 @@ -7,6 +7,267 @@ #include "YGUI.h" #include "YGUtils.h" +static inline void skipSpace (const char *instr, int *i) +{ while (g_ascii_isspace (instr[*i])) (*i)++; } + +typedef struct { + GString *tag; + int tag_len : 31; + unsigned int early_closer : 1; +} TagEntry; + +static TagEntry * +tag_entry_new (GString *tag, int tag_len) +{ + static const char *early_closers[] = { "p", "li" }; + TagEntry *entry = g_new (TagEntry, 1); + entry->tag = tag; + entry->tag_len = tag_len; + entry->early_closer = FALSE; + + unsigned int i; + for (i = 0; i < G_N_ELEMENTS (early_closers); i++) + if (!g_ascii_strncasecmp (tag->str, early_closers[i], tag_len)) + entry->early_closer = TRUE; + return entry; +} + +static void +tag_entry_free (TagEntry *entry) +{ + if (entry && entry->tag) + g_string_free (entry->tag, TRUE); + g_free (entry); +} + +static void +emit_unclosed_tags_for (GString *outp, GQueue *tag_queue, const char *tag_str, int tag_len) +{ + gboolean matched = FALSE; + + // top-level tag ... + if (g_queue_is_empty (tag_queue)) + return; + + do { + TagEntry *last_entry = (TagEntry *)g_queue_pop_tail (tag_queue); + if (!last_entry) + break; + + if (last_entry->tag_len != tag_len || + g_ascii_strncasecmp (last_entry->tag->str, tag_str, tag_len)) { + /* different tag - emit a close ... */ + g_string_append (outp, "</"); + g_string_append_len (outp, last_entry->tag->str, last_entry->tag_len); + g_string_append_c (outp, '>'); + } else + matched = TRUE; + + tag_entry_free (last_entry); + } while (!matched); +} + +static gboolean +check_early_close (GString *outp, GQueue *tag_queue, TagEntry *entry) +{ + TagEntry *last_tag; + + // Early closers: + if (!entry->early_closer) + return FALSE; + + last_tag = (TagEntry *) g_queue_peek_tail (tag_queue); + if (!last_tag || !last_tag->early_closer) + return FALSE; + + if (entry->tag_len != last_tag->tag_len || + g_ascii_strncasecmp (last_tag->tag->str, entry->tag->str, entry->tag_len)) + return FALSE; + + // Emit close & leave last tag on the stack + + g_string_append (outp, "</"); + g_string_append_len (outp, entry->tag->str, entry->tag_len); + g_string_append_c (outp, '>'); + + return TRUE; +} + +/* Some entities are translated by the xhtml parser, but not all... */ +typedef struct EntityMap { + const gchar *html, *text; +} EntityMap; + +static const EntityMap entities[] = { + { "nbsp", " " }, +}; + +static const EntityMap *lookup_entity (const char *html) +{ + unsigned int i; + for (i = 0; i < sizeof (entities) / sizeof (EntityMap); i++) + if (!g_ascii_strncasecmp (html+1, entities[i].html, strlen (entities[i].html))) + return entities+i; + return NULL; +} + +// We have to: +// + rewrite and <hr> tags +// + deal with <a attrib=noquotes> +gchar *ygutils_convert_to_xhtml (const char *instr) +{ + GString *outp = g_string_new (""); + GQueue *tag_queue = g_queue_new(); + int i = 0; + + gboolean was_space = TRUE, pre_mode = FALSE; + skipSpace (instr, &i); + + // we must add an outer tag to make GMarkup happy + g_string_append (outp, "<body>"); + + for (; instr[i] != '\0'; i++) + { + // Tag foo + if (instr[i] == '<') { + // ignore comments + if (strncmp (&instr[i], "", 3) == 0) { + i += 2; + break; + } + continue; + } + + gint j; + gboolean is_close = FALSE; + gboolean in_tag; + int tag_len; + GString *tag = g_string_sized_new (20); + + i++; + skipSpace (instr, &i); + + if (instr[i] == '/') { + i++; + is_close = TRUE; + } + + skipSpace (instr, &i); + + // find the tag name piece + in_tag = TRUE; + tag_len = 0; + for (; instr[i] != '>' && instr[i]; i++) { + if (in_tag) { + if (!g_ascii_isalnum(instr[i])) + in_tag = FALSE; + else + tag_len++; + } + g_string_append_c (tag, instr[i]); + } + + // Unmatched tags + if (!is_close && tag_len == 2 && + (!g_ascii_strncasecmp (tag->str, "hr", 2) || + !g_ascii_strncasecmp (tag->str, "br", 2)) && + tag->str[tag->len - 1] != '/') + g_string_append_c (tag, '/'); + + if (!g_ascii_strncasecmp (tag->str, "pre", 3)) + pre_mode = !is_close; + + // Add quoting for un-quoted attributes + unsigned int k; + for (k = 0; k < tag->len; k++) { + if (tag->str[k] == '=') { + gboolean unquote = tag->str[k+1] != '"'; + if (unquote) + g_string_insert_c (tag, k+1, '"'); + else + k++; + for (k++; tag->str[k]; k++) { + if (unquote && g_ascii_isspace (tag->str[k])) + break; + else if (!unquote && tag->str[k] == '"') + break; + } + if (unquote) + g_string_insert_c (tag, k, '"'); + } + else + tag->str[k] = g_ascii_tolower (tag->str[k]); + } + + // Is it an open or close ? + j = tag->len - 1; + + while (j > 0 && g_ascii_isspace (tag->str[j])) j--; + + gboolean is_open_close = (tag->str[j] == '/'); + if (is_open_close) + ; // ignore it + else if (is_close) + emit_unclosed_tags_for (outp, tag_queue, tag->str, tag_len); + else { + TagEntry *entry = tag_entry_new (tag, tag_len); + + entry->tag = tag; + entry->tag_len = tag_len; + + if (!check_early_close (outp, tag_queue, entry)) + g_queue_push_tail (tag_queue, entry); + else { + entry->tag = NULL; + tag_entry_free (entry); + } + } + + g_string_append_c (outp, '<'); + if (is_close) + g_string_append_c (outp, '/'); + g_string_append_len (outp, tag->str, tag->len); + g_string_append_c (outp, '>'); + + if (is_close || is_open_close) + g_string_free (tag, TRUE); + } + + else if (instr[i] == '&') { // Entity + const EntityMap *entity = lookup_entity (instr+i); + if (entity) { + g_string_append (outp, entity->text); + i += strlen (entity->html); + if (instr[i+1] == ';') i++; + } + else + g_string_append_c (outp, instr[i]); + was_space = FALSE; + } + + else { // Normal text + if (!pre_mode && g_ascii_isspace (instr[i])) { + if (!was_space) + g_string_append_c (outp, ' '); + was_space = TRUE; + } + else { + was_space = FALSE; + g_string_append_c (outp, instr[i]); + } + } + } + + emit_unclosed_tags_for (outp, tag_queue, "", 0); + g_queue_free (tag_queue); + g_string_append (outp, "</body>"); + + gchar *ret = g_string_free (outp, FALSE); + return ret; +} + string YGUtils::mapKBAccel (const string &src) { // we won't use use replace since we also want to escape _ to __ @@ -342,6 +603,75 @@ return foundIcon; } + +/* + * construct a help string by dropping the title, and mentioning + * the first sentence for a dialog sub-title + */ +gchar * +ygutils_headerize_help (const char *help_text, gboolean *cut) +{ + char *text = ygutils_convert_to_xhtml (help_text); + + GString *str = g_string_new (""); + int i; + gboolean copy_word = FALSE; + for (i = 0; text[i]; i++) { + if (text[i] == '<') { + int a = i; + for (; text[i]; i++) + if (text[i] == '>') + break; + + if (!strncasecmp (text+a, "<h", 2) || !strncasecmp (text+a, "<big>", 5) || + (!str->len && !strncasecmp (text+a, "", 3))) { + for (i++; text[i]; i++) { + if (text[i] == '<') + a = i; + if (text[i] == '>') { + if (!strncasecmp (text+a, "</h", 3) || !strncasecmp (text+a, "</big>", 6) || + !strncasecmp (text+a, "", 4)) + break; + } + } + } + } + else if (g_ascii_isspace (text[i])) { + if (copy_word) + g_string_append_c (str, ' '); + copy_word = FALSE; + } + else { + copy_word = TRUE; + g_string_append_c (str, text[i]); + if (text[i] == '.') { + if (g_ascii_isspace (text[i+1]) || text[i+1] == '<') { + i++; + break; + } + } + } + } + *cut = FALSE; + gboolean markup = FALSE; + for (; text[i]; i++) { + if (markup) { + if (text[i] == '>') + markup = FALSE; + } + else { + if (text[i] == '<') + markup = TRUE; + else if (!g_ascii_isspace (text[i])) { + *cut = TRUE; + break; + } + } + } + g_free (text); + return g_string_free (str, FALSE); +} + gboolean ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon) { return YGUtils::setStockIcon (button, label, fallbackIcon); } @@ -381,3 +711,4 @@ window.set_cursor (__LEFT_PTR_WATCH) #endif + Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=53789&r1=5… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Mon Dec 1 18:15:36 2008 @@ -64,6 +64,11 @@ const char *fallbackIcon); GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean useAlpha); + + gchar *ygutils_headerize_help (const char *help_text, gboolean *cut); + + // convert liberal html to xhtml + gchar *ygutils_convert_to_xhtml (const char *instr); }; #endif // YGUTILS_H Modified: trunk/gtk/src/YGWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWizard.cc?rev=53789&r1… ============================================================================== --- trunk/gtk/src/YGWizard.cc (original) +++ trunk/gtk/src/YGWizard.cc Mon Dec 1 18:15:36 2008 @@ -143,8 +143,11 @@ button->setLabel (label); } - virtual void setHelpText (const string &text) + virtual void setHelpText (const string &_text) { + std::string productName = YUI::app()->productName(); + std::string text(_text); + YGUtils::replace (text, "&product;", 9, productName.c_str()); ygtk_wizard_set_help_text (getWizard(), text.c_str()); } Modified: trunk/gtk/src/test.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/test.cc?rev=53789&r1=537… ============================================================================== --- trunk/gtk/src/test.cc (original) +++ trunk/gtk/src/test.cc Mon Dec 1 18:15:36 2008 @@ -79,7 +79,7 @@ { NULL, NULL } }; for (int i = 0; aTests[i].in; i++) { - gchar *out = convert_to_xhtml (aTests[i].in); + gchar *out = ygutils_convert_to_xhtml (aTests[i].in); if (strcmp (out, aTests[i].out)) { fprintf (stderr, "Mis-converted entry %d XML '%s' should be '%s'\n", i, out, aTests[i].out); @@ -157,6 +157,44 @@ return true; } +bool testHeaderize() +{ + fprintf (stderr, "Test headerize\t"); + struct { + const char *in; + const char *out; + gboolean cut; + } aTests[] = { + { "test", "test", FALSE }, + { "<h1>Purpose</h1>This tool lets you install, remove, and update applications.openSUSE's software management", + "This tool lets you install, remove, and update applications.", TRUE }, + { "\n<big>Section List</big> \nFrom Other,\nyou can manually edit the boot loader configuration files, clear the current\n" + "configuration and propose a new configuration, start from scratch, or reread\nthe configuration saved on your disk. If you have multiple Linux systems installed,", + "From Other, you can manually edit the boot loader configuration files, clear the current configuration and " + "propose a new configuration, start from scratch, or reread the configuration saved on your disk.", TRUE }, + { "<big>Sound Cards<big>Select an unconfigured card from the list and press Edit to\nconfigure it. If the card was not detected, press Add and\nconfigure the card manually.", + "Select an unconfigured card from the list and press Edit to configure it.", TRUE }, + { "\n<big>Service Start</big> \nTo start the service every time your computer is booted, set\n" + "Enable firewall. Otherwise set Disable firewall.\n<big>Switch On or Off</big> ", + "To start the service every time your computer is booted, set Enable firewall.", TRUE }, + { NULL, NULL } + }; + for (int i = 0; aTests[i].in; i++) { + gboolean cut = FALSE; + char *out = ygutils_headerize_help (aTests[i].in, &cut); + if (strcmp (aTests[i].out, out)) { + fprintf (stderr, "Mis-headerized test %d:\n-- \n%s\n-- should be --\n%s\n-- xhtml --\n%s\n-- \n", + i, out, aTests[i].out, ygutils_convert_to_xhtml (aTests[i].in)); + return false; + } + if (!!aTests[i].cut != !!cut) + fprintf (stderr, "Mis-labelled as cut (%d)\n", !!cut); + fprintf (stderr, "%d ", i); + } + fprintf (stderr, "\n"); + return true; +} + int main (int argc, char **argv) { bool bSuccess = true; @@ -165,6 +203,7 @@ bSuccess &= testXHtmlConvert(); bSuccess &= testMarkupEscape(); bSuccess &= testTruncate(); + bSuccess &= testHeaderize(); return !bSuccess; } Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=53789… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Mon Dec 1 18:15:36 2008 @@ -14,267 +14,8 @@ #define PARAGRAPH_SPACING 12 // convert liberal html to xhtml since we use a xhtml parser - -static inline void skipSpace (const char *instr, int *i) -{ while (g_ascii_isspace (instr[*i])) (*i)++; } - -typedef struct { - GString *tag; - int tag_len : 31; - unsigned int early_closer : 1; -} TagEntry; - -static TagEntry * -tag_entry_new (GString *tag, int tag_len) -{ - static const char *early_closers[] = { "p", "li" }; - TagEntry *entry = g_new (TagEntry, 1); - entry->tag = tag; - entry->tag_len = tag_len; - entry->early_closer = FALSE; - - unsigned int i; - for (i = 0; i < G_N_ELEMENTS (early_closers); i++) - if (!g_ascii_strncasecmp (tag->str, early_closers[i], tag_len)) - entry->early_closer = TRUE; - return entry; -} - -static void -tag_entry_free (TagEntry *entry) -{ - if (entry && entry->tag) - g_string_free (entry->tag, TRUE); - g_free (entry); -} - -static void -emit_unclosed_tags_for (GString *outp, GQueue *tag_queue, const char *tag_str, int tag_len) -{ - gboolean matched = FALSE; - - // top-level tag ... - if (g_queue_is_empty (tag_queue)) - return; - - do { - TagEntry *last_entry = (TagEntry *)g_queue_pop_tail (tag_queue); - if (!last_entry) - break; - - if (last_entry->tag_len != tag_len || - g_ascii_strncasecmp (last_entry->tag->str, tag_str, tag_len)) { - /* different tag - emit a close ... */ - g_string_append (outp, "</"); - g_string_append_len (outp, last_entry->tag->str, last_entry->tag_len); - g_string_append_c (outp, '>'); - } else - matched = TRUE; - - tag_entry_free (last_entry); - } while (!matched); -} - -static gboolean -check_early_close (GString *outp, GQueue *tag_queue, TagEntry *entry) -{ - TagEntry *last_tag; - - // Early closers: - if (!entry->early_closer) - return FALSE; - - last_tag = (TagEntry *) g_queue_peek_tail (tag_queue); - if (!last_tag || !last_tag->early_closer) - return FALSE; - - if (entry->tag_len != last_tag->tag_len || - g_ascii_strncasecmp (last_tag->tag->str, entry->tag->str, entry->tag_len)) - return FALSE; - - // Emit close & leave last tag on the stack - - g_string_append (outp, "</"); - g_string_append_len (outp, entry->tag->str, entry->tag_len); - g_string_append_c (outp, '>'); - - return TRUE; -} - -/* Some entities are translated by the xhtml parser, but not all... */ -typedef struct EntityMap { - const gchar *html, *text; -} EntityMap; - -static const EntityMap entities[] = { - { "nbsp", " " }, -}; - -static const EntityMap *lookup_entity (const char *html) -{ - int i; - for (i = 0; i < sizeof (entities) / sizeof (EntityMap); i++) - if (!g_ascii_strncasecmp (html+1, entities[i].html, strlen (entities[i].html))) - return entities+i; - return NULL; -} - -// We have to: -// + rewrite and <hr> tags -// + deal with <a attrib=noquotes> -gchar *convert_to_xhtml (const char *instr) -{ - GString *outp = g_string_new (""); - GQueue *tag_queue = g_queue_new(); - int i = 0; - - gboolean was_space = TRUE, pre_mode = FALSE; - skipSpace (instr, &i); - - // we must add an outer tag to make GMarkup happy - g_string_append (outp, "<body>"); - - for (; instr[i] != '\0'; i++) - { - // Tag foo - if (instr[i] == '<') { - // ignore comments - if (strncmp (&instr[i], "", 3) == 0) { - i += 2; - break; - } - continue; - } - - gint j; - gboolean is_close = FALSE; - gboolean in_tag; - int tag_len; - GString *tag = g_string_sized_new (20); - - i++; - skipSpace (instr, &i); - - if (instr[i] == '/') { - i++; - is_close = TRUE; - } - - skipSpace (instr, &i); - - // find the tag name piece - in_tag = TRUE; - tag_len = 0; - for (; instr[i] != '>' && instr[i]; i++) { - if (in_tag) { - if (!g_ascii_isalnum(instr[i])) - in_tag = FALSE; - else - tag_len++; - } - g_string_append_c (tag, instr[i]); - } - - // Unmatched tags - if (!is_close && tag_len == 2 && - (!g_ascii_strncasecmp (tag->str, "hr", 2) || - !g_ascii_strncasecmp (tag->str, "br", 2)) && - tag->str[tag->len - 1] != '/') - g_string_append_c (tag, '/'); - - if (!g_ascii_strncasecmp (tag->str, "pre", 3)) - pre_mode = !is_close; - - // Add quoting for un-quoted attributes - unsigned int k; - for (k = 0; k < tag->len; k++) { - if (tag->str[k] == '=') { - gboolean unquote = tag->str[k+1] != '"'; - if (unquote) - g_string_insert_c (tag, k+1, '"'); - else - k++; - for (k++; tag->str[k]; k++) { - if (unquote && g_ascii_isspace (tag->str[k])) - break; - else if (!unquote && tag->str[k] == '"') - break; - } - if (unquote) - g_string_insert_c (tag, k, '"'); - } - else - tag->str[k] = g_ascii_tolower (tag->str[k]); - } - - // Is it an open or close ? - j = tag->len - 1; - - while (j > 0 && g_ascii_isspace (tag->str[j])) j--; - - gboolean is_open_close = (tag->str[j] == '/'); - if (is_open_close) - ; // ignore it - else if (is_close) - emit_unclosed_tags_for (outp, tag_queue, tag->str, tag_len); - else { - TagEntry *entry = tag_entry_new (tag, tag_len); - - entry->tag = tag; - entry->tag_len = tag_len; - - if (!check_early_close (outp, tag_queue, entry)) - g_queue_push_tail (tag_queue, entry); - else { - entry->tag = NULL; - tag_entry_free (entry); - } - } - - g_string_append_c (outp, '<'); - if (is_close) - g_string_append_c (outp, '/'); - g_string_append_len (outp, tag->str, tag->len); - g_string_append_c (outp, '>'); - - if (is_close || is_open_close) - g_string_free (tag, TRUE); - } - - else if (instr[i] == '&') { // Entity - const EntityMap *entity = lookup_entity (instr+i); - if (entity) { - g_string_append (outp, entity->text); - i += strlen (entity->html); - if (instr[i+1] == ';') i++; - } - else - g_string_append_c (outp, instr[i]); - was_space = FALSE; - } - - else { // Normal text - if (!pre_mode && g_ascii_isspace (instr[i])) { - if (!was_space) - g_string_append_c (outp, ' '); - was_space = TRUE; - } - else { - was_space = FALSE; - g_string_append_c (outp, instr[i]); - } - } - } - - emit_unclosed_tags_for (outp, tag_queue, "", 0); - g_queue_free (tag_queue); - g_string_append (outp, "</body>"); - - gchar *ret = g_string_free (outp, FALSE); - return ret; -} +// convert liberal html to xhtml +extern gchar *ygutils_convert_to_xhtml (const char *instr); G_DEFINE_TYPE (YGtkRichText, ygtk_rich_text, GTK_TYPE_TEXT_VIEW) @@ -871,7 +612,7 @@ GMarkupParseContext *ctx; ctx = g_markup_parse_context_new (&rt_parser, (GMarkupParseFlags)0, &state, NULL); - char *xml = convert_to_xhtml (text); + char *xml = ygutils_convert_to_xhtml (text); GError *error = NULL; if (!g_markup_parse_context_parse (ctx, xml, -1, &error)) { g_warning ("Markup parse error '%s'", error ? error->message : "Unknown"); Modified: trunk/gtk/src/ygtkrichtext.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.h?rev=53789… ============================================================================== --- trunk/gtk/src/ygtkrichtext.h (original) +++ trunk/gtk/src/ygtkrichtext.h Mon Dec 1 18:15:36 2008 @@ -54,9 +54,6 @@ void ygtk_rich_text_set_background (YGtkRichText *rtext, GdkPixbuf *pixbuf); -// convert liberal html to xhtml -gchar *convert_to_xhtml (const char *instr); - G_END_DECLS #endif /* YGTK_RICH_TEXT_H */ Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=53789&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Dec 1 18:15:36 2008 @@ -31,6 +31,7 @@ const char *fallbackIcon); extern GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean alpha); extern void ygdialog_setTitle (const gchar *title, gboolean sticky); +extern gchar *ygutils_headerize_help (const char *help_text, gboolean *cut); //** YGtkHelpDialog @@ -420,68 +421,8 @@ static void ygtk_wizard_header_set_description (YGtkWizardHeader *header, const gchar *text) { - GString *str = g_string_new (""); - int i; - gboolean copy_word = FALSE; - for (i = 0; text[i]; i++) { - if (text[i] == '<') { - int a = i; - for (; text[i]; i++) - if (text[i] == '>') - break; - if (!strncasecmp (text+a, "<h", 2) || !strncasecmp (text+a, "<big>", 5) || - (!str->len && !strncasecmp (text+a, "", 3))) { - for (i++; text[i]; i++) { - if (text[i] == '<') - a = i; - if (text[i] == '>') { - if (!strncasecmp (text+a, "</h", 3) || !strncasecmp (text+a, "</big>", 6) || - !strncasecmp (text+a, "", 4)) - break; - } - } - } - } - else if (g_ascii_isspace (text[i])) { - if (copy_word) - g_string_append_c (str, ' '); - copy_word = FALSE; - } - else { - copy_word = TRUE; - if (text[i] == '&') { - if (!strncasecmp (text+i, "&product;", 9)) { - g_string_append (str, "Linux"); - i += 8; - } - } - else { - g_string_append_c (str, text[i]); - if (text[i] == '.') { - if (g_ascii_isspace (text[i+1]) || text[i+1] == '<') { - i++; - break; - } - } - } - } - } - gboolean cut = FALSE, markup = FALSE; - for (; text[i]; i++) { - if (markup) { - if (text[i] == '>') - markup = FALSE; - } - else { - if (text[i] == '<') - markup = TRUE; - else if (!g_ascii_isspace (text[i])) { - cut = TRUE; - break; - } - } - } - gchar *desc = g_string_free (str, FALSE); + gboolean cut = FALSE; + gchar *desc = ygutils_headerize_help (text, &cut); ygtk_link_label_set_text (YGTK_LINK_LABEL (header->description), desc, NULL, cut); g_free (desc); } @@ -859,6 +800,8 @@ if (!strcmp (title, "YaST")) title = 0; ygtk_help_text_set (wizard->m_help, title, text); +/* helpful for building out test.cc + fprintf (stderr, "Help text:\n%s\n", text); */ ygtk_wizard_header_set_description (YGTK_WIZARD_HEADER (wizard->m_title), text); ENABLE_WIDGET_STR (text, wizard->help_button); } -- 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] r53788 - /tags/stable-2_17_60/storage/
by aschnell＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: aschnell Date: Mon Dec 1 17:52:39 2008 New Revision: 53788 URL: http://svn.opensuse.org/viewcvs/yast?rev=53788&view=rev Log: Created tag stable-2_17_60 for storage Added: tags/stable-2_17_60/storage/ - copied from r53787, trunk/storage/ -- 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] r53787 - /tags/stable-2_17_60/storage/
by aschnell＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: aschnell Date: Mon Dec 1 17:52:34 2008 New Revision: 53787 URL: http://svn.opensuse.org/viewcvs/yast?rev=53787&view=rev Log: Removed tag stable-2_17_60 for storage Removed: tags/stable-2_17_60/storage/ -- 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] r53786 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: aschnell Date: Mon Dec 1 17:51:56 2008 New Revision: 53786 URL: http://svn.opensuse.org/viewcvs/yast?rev=53786&view=rev Log: - added debug output to easy BIOS ID with BIOS RAID problems (bnc #444595) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Dec 1 17:51:56 2008 @@ -2,6 +2,8 @@ Mon Dec 01 15:36:40 CET 2008 - aschnell(a)suse.de - clear uuid when setting volume to format (bnc #450097) +- added debug output to easy BIOS ID with BIOS RAID problems + (bnc #444595) - 2.17.60 ------------------------------------------------------------------- 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 Mon Dec 1 17:51:56 2008 @@ -3365,6 +3365,7 @@ return( target ); } + /** * Returns a system target map. * @@ -3375,7 +3376,7 @@ * ... ? * ] */ -global map<string,map> GetTargetMap() +global map<string, map> GetTargetMap() { if (!InitLibstorage(false)) return nil; @@ -3447,18 +3448,18 @@ if( size(bios_id_raid)>0 ) { y2milestone( "bios_id_raid:%1", bios_id_raid ); - foreach( string dm, string bios, bios_id_raid, - ``{ + foreach( string dm, string bios, bios_id_raid, { integer pos = findfirstof( dm, "0123456789" ); integer minor = tointeger( substring( dm, pos )); y2milestone( "pos:%1 minor:%2", pos, minor ); - foreach( string dev, map c, tmp, - ``{ - if( c["type"]:`CT_UNKNOWN == `CT_DMRAID && - c["minor"]:0 == minor ) - tmp[dev,"bios_id"] = bios; - }); + foreach (string dev, map c, tmp, { + if (c["type"]:`CT_UNKNOWN == `CT_DMRAID && c["minor"]:0 == minor) + { + y2milestone("addind bios_id %1 to %2", bios, dev); + tmp[dev, "bios_id"] = bios; + } }); + }); } StorageMap[targets_key] = tmp; } @@ -3478,8 +3479,15 @@ SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_ii"), tmp ); y2milestone ("changed done" ); } - return StorageMap[targets_key]:$[]; - }; + + map<string, map> ret = StorageMap[targets_key]:$[]; + if (changed) + y2milestone("GetTargetMap changed:%1 ret:%2", changed, ret); + else + y2debug("GetTargetMap changed:%1 ret:%2", changed, ret); + return ret; +} + global void SetRecursiveRemoval( boolean val ) { -- 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] r53785 - /tags/stable-2_17_43/installation/
by locilka＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: locilka Date: Mon Dec 1 17:04:24 2008 New Revision: 53785 URL: http://svn.opensuse.org/viewcvs/yast?rev=53785&view=rev Log: Created tag stable-2_17_43 for installation Added: tags/stable-2_17_43/installation/ - copied from r53784, 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] r53784 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_ask_online_update.ycp
by locilka＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: locilka Date: Mon Dec 1 17:03:40 2008 New Revision: 53784 URL: http://svn.opensuse.org/viewcvs/yast?rev=53784&view=rev Log: - Fixed proposing the online update depending on the fact whether network is running (bnc #450229). - 2.17.43 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_ask_online_update.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=53784&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Dec 1 17:03:40 2008 @@ -1 +1 @@ -2.17.42 +2.17.43 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 Dec 1 17:03:40 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 1 16:59:14 CET 2008 - locilka(a)suse.cz + +- Fixed proposing the online update depending on the fact whether + network is running (bnc #450229). +- 2.17.43 + +------------------------------------------------------------------- Fri Nov 28 15:05:02 CET 2008 - locilka(a)suse.cz - Updated labels of Installation Scenarios for SLES (bnc #428202). Modified: trunk/installation/src/clients/inst_ask_online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_as… ============================================================================== --- trunk/installation/src/clients/inst_ask_online_update.ycp (original) +++ trunk/installation/src/clients/inst_ask_online_update.ycp Mon Dec 1 17:03:40 2008 @@ -25,8 +25,14 @@ import "Label"; import "Internet"; import "Installation"; + import "NetworkService"; - if (!Internet::do_you) return `auto; + // BNC #450229 + // There used to be >if (!Internet::do_you)< + if (NetworkService::isNetworkRunning() != true) { + y2milestone ("No network running, skipping online update..."); + return `auto; + } map ui = UI::GetDisplayInfo(); @@ -106,17 +112,17 @@ } else if ( ret == `next ) { - if ( (boolean) UI::QueryWidget(`id(`noupdate), `Value) ) - ret = `skip; + // Skipping online update + if ((boolean) UI::QueryWidget(`id(`noupdate), `Value)) { + Internet::do_you = false; + } else { + // needed later + // BNC #450229 + Internet::do_you = true; + } } - } until ( ret == `next || ret == `back || ret == `skip); - - if ( ret == `skip ) - { - Internet::do_you = false; - ret = `next; - } + } until ( ret == `next || ret == `back ); return (symbol)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] r53783 - /tags/stable-2_17_27/users/
by jsuchome＠svn.opensuse.org 01 Dec '08

01 Dec '08

Author: jsuchome Date: Mon Dec 1 15:58:13 2008 New Revision: 53783 URL: http://svn.opensuse.org/viewcvs/yast?rev=53783&view=rev Log: Created tag stable-2_17_27 for users Added: tags/stable-2_17_27/users/ - copied from r53782, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0