August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40634 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Callbacks.cc
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 20:01:50 2007 New Revision: 40634 URL: http://svn.opensuse.org/viewcvs/yast?rev=40634&view=rev Log: - preliminary fix for source redirection (compile fix only) (#294481) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 30 20:01:50 2007 @@ -3,6 +3,8 @@ - don't log debug messages from zypp if debug logging is turned off (#306458) +- preliminary fix for source redirection (compile fix only) + (#294481) ------------------------------------------------------------------- Wed Aug 29 09:36:00 CEST 2007 - lslezak(a)suse.cz Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Thu Aug 30 20:01:50 2007 @@ -43,7 +43,7 @@ // remember redirected URLs // FIXME huh? -std::map<std::vector<zypp::RepoInfo>::size_type, std::map<unsigned, std::string> > redirect_map; +std::map<zypp::Url, std::map<unsigned, std::string> > redirect_map; /////////////////////////////////////////////////////////////////// namespace ZyppRecipients { @@ -993,7 +993,7 @@ { MediaChangeReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual Action requestMedia(zypp::Repository source, unsigned mediumNr, zypp::media::MediaChangeReport::Error error, const std::string &description) + virtual Action requestMedia(zypp::Url &url, unsigned int mediumNr, zypp::media::MediaChangeReport::Error error, const std::string &description) { if ( _silent_probing == MEDIA_CHANGE_DISABLE ) return zypp::media::MediaChangeReport::ABORT; @@ -1009,7 +1009,7 @@ callback.addStr( description ); // search URL in the redirection map - std::map<std::vector<zypp::RepoInfo>::size_type, std::map<unsigned, std::string> >::const_iterator source_it = redirect_map.find(source.numericId()); + std::map<zypp::Url, std::map<unsigned, std::string> >::const_iterator source_it = redirect_map.find(url); bool found = false; std::string report_url; @@ -1025,13 +1025,7 @@ // report the redirected URL report_url = (*media_it).second; - std::string original_url; - if (source.info().baseUrlsBegin() != source.info().baseUrlsEnd()) - { - original_url = source.info().baseUrlsBegin()->asString(); - } - - y2milestone("Using redirected URL %s, original URL: %s", report_url.c_str(), original_url.c_str()); + y2milestone("Using redirected URL %s, original URL: %s", report_url.c_str(), url.asString().c_str()); } } @@ -1039,17 +1033,14 @@ { // the source has not been redirected // use URL of the source - if (source.info().baseUrlsBegin() != source.info().baseUrlsEnd()) - { - report_url = source.info().baseUrlsBegin()->asString(); - } + report_url = url.asString(); } // current URL callback.addStr( report_url ); // current product name (use the alias, see #214886) - callback.addStr( source.info().alias() ); + callback.addStr( std::string() /*FIXME*/ ); // current medium, -1 means enable [Ignore] callback.addInt( 0 ); @@ -1086,15 +1077,16 @@ // otherwise change media URL // try/catch to catch invalid URLs try { + // FIXME set the new URL zypp::Url ret_url (ret); #warning FIXME: MediaChange callback - redirection is missing! y2internal("Source redirection is not yet implemented in yast2-pkg-bindings"); //source.redirect( mediumNr, ret_url ); // remember the redirection - std::map<unsigned, std::string> source_redir = redirect_map[source.numericId()]; + std::map<unsigned, std::string> source_redir = redirect_map[url]; source_redir[mediumNr] = ret; - redirect_map[source.numericId()] = source_redir; + redirect_map[url] = source_redir; y2milestone("Source redirected to %s", ret.c_str()); @@ -1108,7 +1100,7 @@ } // return default value from the parent class - return zypp::media::MediaChangeReport::requestMedia(source, mediumNr, error, description); + return zypp::media::MediaChangeReport::requestMedia(url, mediumNr, error, description); } }; -- 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] r40633 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/PkgModule.cc
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 19:59:04 2007 New Revision: 40633 URL: http://svn.opensuse.org/viewcvs/yast?rev=40633&view=rev Log: - don't log debug messages from zypp if debug logging is turned off (#306458) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/PkgModule.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 30 19:59:04 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 30 19:57:49 CEST 2007 - lslezak(a)suse.cz + +- don't log debug messages from zypp if debug logging is turned off + (#306458) + +------------------------------------------------------------------- Wed Aug 29 09:36:00 CEST 2007 - lslezak(a)suse.cz - reimplemented Pkg::SourceCacheCopyTo() - copy zypp cache from the Modified: trunk/pkg-bindings/src/PkgModule.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModule.cc?re… ============================================================================== --- trunk/pkg-bindings/src/PkgModule.cc (original) +++ trunk/pkg-bindings/src/PkgModule.cc Thu Aug 30 19:59:04 2007 @@ -22,6 +22,7 @@ #include <PkgModule.h> #include <y2util/y2log.h> +#include <zypp/base/Logger.h> #include <zypp/base/LogControl.h> #include <zypp/Pathname.h> @@ -34,10 +35,34 @@ { virtual void writeOut( const std::string & formated_r ) { - y2lograw((formated_r+"\n").c_str()); + // don't log empty (debug) messages + if (!formated_r.empty()) + { + y2lograw((formated_r+"\n").c_str()); + } } }; +struct YaSTZyppFormatter : public zypp::base::LogControl::LineFormater +{ + virtual std::string format( const std::string & group_r, + zypp::base::logger::LogLevel level_r, + const char * file_r, + const char * func_r, + int line_r, + const std::string & message_r ) + { + if (get_log_debug() || level_r > zypp::base::logger::E_DBG) + { + // call the default implementation + return zypp::base::LogControl::LineFormater::format(group_r, level_r, file_r, func_r, line_r, message_r); + } + + // return empty string (ignore debug messages when debug is tuned off) + return std::string(); + } + +}; PkgModule* PkgModule::instance () { @@ -48,6 +73,9 @@ boost::shared_ptr<YaSTZyppLogger> myLogger( new YaSTZyppLogger ); zypp::base::LogControl::instance().setLineWriter( myLogger ); + boost::shared_ptr<YaSTZyppFormatter> myFormatter( new YaSTZyppFormatter ); + zypp::base::LogControl::instance().setLineFormater( myFormatter ); + current_pkg = new PkgModule (); } -- 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] r40632 - /tags/stable-2_15_23/storage/
by fehr＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: fehr Date: Thu Aug 30 17:14:59 2007 New Revision: 40632 URL: http://svn.opensuse.org/viewcvs/yast?rev=40632&view=rev Log: Created tag stable-2_15_23 for storage Added: tags/stable-2_15_23/storage/ - copied from r40631, 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] r40631 - in /trunk/storage: VERSION package/yast2-storage.changes
by fehr＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: fehr Date: Thu Aug 30 17:14:52 2007 New Revision: 40631 URL: http://svn.opensuse.org/viewcvs/yast?rev=40631&view=rev Log: version 2.15.23 Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=40631&r1=406… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu Aug 30 17:14:52 2007 @@ -1 +1 @@ -2.15.22 +2.15.23 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 Thu Aug 30 17:14:52 2007 @@ -4,6 +4,7 @@ - call insserv for boot.crypto during update from <=10.2 (#305105) - restart boot.quota if quota options have changed (#304841) - prevent proposal of install medium under XEN (#297321) +- version 2.15.23 ------------------------------------------------------------------- Tue Aug 28 17:28:32 CEST 2007 - fehr(a)suse.de -- 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] r40630 - /tags/stable-2_15_7/kdump/
by juhliarik＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: juhliarik Date: Thu Aug 30 16:49:25 2007 New Revision: 40630 URL: http://svn.opensuse.org/viewcvs/yast?rev=40630&view=rev Log: Created tag stable-2_15_7 for kdump Added: tags/stable-2_15_7/kdump/ - copied from r40629, trunk/kdump/ -- 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] r40629 - in /trunk/kdump: VERSION package/yast2-kdump.changes
by juhliarik＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: juhliarik Date: Thu Aug 30 16:49:08 2007 New Revision: 40629 URL: http://svn.opensuse.org/viewcvs/yast?rev=40629&view=rev Log: new version V 2.15.7 correction for adding crashkernel option Modified: trunk/kdump/VERSION trunk/kdump/package/yast2-kdump.changes Modified: trunk/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/VERSION?rev=40629&r1=40628… ============================================================================== --- trunk/kdump/VERSION (original) +++ trunk/kdump/VERSION Thu Aug 30 16:49:08 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/package/yast2-kdump.change… ============================================================================== --- trunk/kdump/package/yast2-kdump.changes (original) +++ trunk/kdump/package/yast2-kdump.changes Thu Aug 30 16:49:08 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Aug 30 16:35:32 CEST 2007 - juhliarik(a)suse.cz + +- added correction for: + bug#300124 - Adding boot options via yast bootloader doesn't work + bug#305905 - Unneeded sleeps during KDump reading +- added recommends for makedumpfile +- V 2.15.7 + +------------------------------------------------------------------- Mon Aug 27 16:44:48 CEST 2007 - juhliarik(a)suse.cz - added correction for problems: -- 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] r40628 - /trunk/kdump/yast2-kdump.spec.in
by juhliarik＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: juhliarik Date: Thu Aug 30 16:40:33 2007 New Revision: 40628 URL: http://svn.opensuse.org/viewcvs/yast?rev=40628&view=rev Log: added Recommends: makedumpfile Modified: trunk/kdump/yast2-kdump.spec.in Modified: trunk/kdump/yast2-kdump.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/yast2-kdump.spec.in?rev=40… ============================================================================== --- trunk/kdump/yast2-kdump.spec.in (original) +++ trunk/kdump/yast2-kdump.spec.in Thu Aug 30 16:40:33 2007 @@ -4,6 +4,9 @@ Requires: yast2 yast2-storage yast2-bootloader BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-storage yast2-bootloader +Recommends: makedumpfile + + Summary: Configuration of kdump %description -- 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] r40627 - /trunk/packager/src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 16:32:27 2007 New Revision: 40627 URL: http://svn.opensuse.org/viewcvs/yast?rev=40627&view=rev Log: - decreased logging verbosity Modified: trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Thu Aug 30 16:32:27 2007 @@ -1566,7 +1566,7 @@ global void StartDownload (string url, string localfile) { - y2milestone("Downloading %1 to %2", url, localfile); + y2debug("Downloading %1 to %2", url, localfile); // heading of popup string heading = _("Downloading"); -- 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] r40626 - /trunk/kdump/src/Kdump.ycp
by juhliarik＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: juhliarik Date: Thu Aug 30 16:28:05 2007 New Revision: 40626 URL: http://svn.opensuse.org/viewcvs/yast?rev=40626&view=rev Log: added patch for bug# 300124 - Adding boot options via yast bootloader doesn't work Modified: trunk/kdump/src/Kdump.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=40626&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Aug 30 16:28:05 2007 @@ -47,6 +47,7 @@ import "Popup"; import "Arch"; import "Mode"; +import "BootCommon"; /** * Prototypes @@ -126,6 +127,18 @@ */ global string alocated_memory = "0"; + + +/** + * String option identify which boot section was used + * during boot process + * + * string value actual boot section + */ + +global string actual_boot_section = ""; + + /** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. @@ -258,6 +271,141 @@ /** + * Compare boot section options with + * + * options from running kernel + * @return integer return number of differences + */ + +integer CmpKernelAndBootOptions (list <string> kernel_option, list <string> boot_options) { + integer result = size(kernel_option); + integer dif_size = size(boot_options) - size(kernel_option); + if (dif_size < 0) + dif_size = dif_size*(-1); + foreach (string option, kernel_option, { + if (contains(boot_options, option)) + result = result -1; + }); + + result = result + dif_size; + return result; +} + + +/** + * Function add into option from boot + * section root device and vgamode + * + * @return list <string> boot section + root and vgamode + */ + + +list <string> AddDeviceVgamode (map section) { + string tmp_boot_section = tostring(section["append"]:nil); + //adding root device + tmp_boot_section = tmp_boot_section + " root=" + tostring(section["root"]:nil); + tmp_boot_section = tmp_boot_section + " vga=" + tostring(section["vgamode"]:nil); + + return splitstring(tmp_boot_section," "); + +} + + +/** + * Read actual boot section + * + * read kernal version and boot options + * @return string actual boot section + */ + + +string GetActualBootSection () { + //read option from bootlaoder + + string result = ""; + string kernel_boot_options = ""; + string kernel_version = ""; + integer min_dif_size = 1000; + + //reading bootloader settings + boolean old_progress = Progress::set (false); + Bootloader::Read(); + Progress::set (old_progress); + + //reading kernel options + string command = "cat /proc/cmdline"; + map options = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[kdump] (GetActualBootSection) command read boot options from kernel: %1 output: %2",command, options); + + if (options["exit"]:nil != 0) + return ""; + + kernel_boot_options = tostring(options["stdout"]:nil); + //Popup::Message(kernel_boot_options); + + //reading version of kernel + command = "uname -r"; + options = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[kdump] (GetActualBootSection) command read kernel version: %1 output: %2",command, options); + + if (options["exit"]:nil != 0) + return ""; + + kernel_version = tostring(options["stdout"]:nil); + + //Popup::Message(kernel_version); + + y2milestone("[kdump] (GetActualBootSection) kerne version: %1",kernel_version); + + + //boot sections from bootloader + list<map<string,any> > sects = BootCommon::sections; + + //deleting non linux sections + sects = filter (map<string,any> s, sects, ``( + ! haskey (s, "chainloader"))); + + y2milestone("[kdump] (GetActualBootSection) BootCommon::sections only linux sections: %1",sects); + + //find probably boot section, what was used during start-up + foreach(map section, sects, { + + string image = tostring(section["image"]:nil); + + if (image != nil) { + //Popup::Message(image); + command = "/sbin/get_kernel_version "+image; + options = (map)SCR::Execute (.target.bash_output, command); + + if (options["exit"]:nil == 0) { + string ret = tostring(options["stdout"]:nil); + + if (ret == kernel_version) { + //Popup::Message("hura!"); + integer value = CmpKernelAndBootOptions(splitstring(kernel_boot_options," "),AddDeviceVgamode(section)); + if (value < min_dif_size) { + min_dif_size = value; + result = tostring(section["name"]:nil); + } + //Popup::Message(tostring(value)); + } //end if (ret == kernel_version) + } // end if (options["exit"]:nil == 0) + } //end of if (image != nil) + }); //end of foreach(map section, sects, { + + + //Popup::Message(result); + + y2milestone("[kdump] (GetActualBootSection) selected boot section : %1",result); + return result; + +} + + + + + +/** * Read current kdump configuration * * read kernel parameter "crashkernel" @@ -266,7 +414,16 @@ boolean ReadKdumpKernelParam () { - string result = Bootloader::getKernelParam (Bootloader::getDefaultSection (), "crashkernel"); + //boolean old_progress = Progress::set (false); + //Bootloader::Read(); + //Progress::set (old_progress); + actual_boot_section = GetActualBootSection (); + + if (actual_boot_section == "") + actual_boot_section = Bootloader::getDefaultSection (); + + string result = Bootloader::getKernelParam (actual_boot_section, "crashkernel"); + //Popup::Message(result); if (result == "false") { crashkernel_param = false; @@ -407,6 +564,7 @@ boolean WriteKdumpBootParameter () { boolean result = true; + boolean old_progress = false; if (add_crashkernel_param) { string crash_value = ""; crash_value = alocated_memory+"M@"; @@ -425,7 +583,10 @@ if ((!crashkernel_param) || (crash_value != crashkernel_param_value)) { //Popup::Message(Bootloader::getDefaultSection ()); - result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", crash_value); // + result = Bootloader::setKernelParam (actual_boot_section, "crashkernel", crash_value); + old_progress = Progress::set (false); + Bootloader::Write(); + Progress::set (old_progress); //Popup::Message(crash_value); y2milestone("[kdump] (WriteKdumpBootParameter) adding chrashkernel option with value : %1", crash_value); if (!Mode::commandline()) @@ -444,7 +605,10 @@ } else { if (crashkernel_param) { //delete crashkernel paramter from bootloader - result = Bootloader::setKernelParam (Bootloader::getDefaultSection (), "crashkernel", "false"); + result = Bootloader::setKernelParam (actual_boot_section, "crashkernel", "false"); + old_progress = Progress::set (false); + Bootloader::Write(); + Progress::set (old_progress); if (!Mode::commandline()) Popup::Message(_("For applying changes is necessary reboot.")); } @@ -467,7 +631,7 @@ /* Kdump read dialog caption */ string caption = _("Initializing kdump Configuration"); integer steps = 4; - sleep(sl); + //sleep(sl); Progress::New( caption, " ", steps, [ /* Progress stage 1/4 */ @@ -492,7 +656,7 @@ "" ); - sleep(sl); + //sleep(sl); // read database if(Abort()) return false; Progress::NextStage(); @@ -524,7 +688,7 @@ if(Abort()) return false; /* Progress finished */ Progress::NextStage(); - sleep(sl); + //sleep(sl); if(Abort()) return false; modified = 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] r40625 - /tags/stable-2_15_19/bootloader/
by pth＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: pth Date: Thu Aug 30 15:54:56 2007 New Revision: 40625 URL: http://svn.opensuse.org/viewcvs/yast?rev=40625&view=rev Log: Created tag stable-2_15_19 for bootloader Added: tags/stable-2_15_19/bootloader/ - copied from r40624, 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