September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40877 - in /trunk/mail: src/Mail.ycp src/MailServer.ycp src/mail-advanced.ycp src/mail-server_complex.ycp src/mail.ycp yast2-mail.spec.in
by varkoly＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: varkoly Date: Wed Sep 12 15:21:52 2007 New Revision: 40877 URL: http://svn.opensuse.org/viewcvs/yast?rev=40877&view=rev Log: avoid versionless Provides and Requiers now mail use the CommandLine module Modified: trunk/mail/src/Mail.ycp trunk/mail/src/MailServer.ycp trunk/mail/src/mail-advanced.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail.ycp trunk/mail/yast2-mail.spec.in Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=40877&r1=4… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Sep 12 15:21:52 2007 @@ -308,6 +308,7 @@ */ define void ReadMta () ``{ // so that AY cloning works, #45071 + y2milestone ("========== Reading MTA =========="); if (PackageSystem::Installed ("sendmail")) { mta = `sendmail; @@ -320,6 +321,7 @@ { mta = `other; } + y2milestone ("Read MTA: %1", mta); } /** Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=4087… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Wed Sep 12 15:21:52 2007 @@ -65,6 +65,11 @@ // Settings: Define all variables needed for configuration of mail-server /** + * True if the modul was started with the option 'setup'. + */ +global boolean setup = false; + +/** * True if there is server certificate. */ global boolean CertExist = false; Modified: trunk/mail/src/mail-advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=4… ============================================================================== --- trunk/mail/src/mail-advanced.ycp (original) +++ trunk/mail/src/mail-advanced.ycp Wed Sep 12 15:21:52 2007 @@ -78,29 +78,6 @@ } } -/* - after merging yast2-mail and yast2-mail-server we have to be - carefull not to corrupt the configuration of the other modul -*/ -if( !setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) -{ - if( - ! Popup::AnyQuestionRichText( - Label::WarningMsg(), - _("You have configured your MTA without LDAP support.<br>") + - _("This modul will configure your MTA with LDAP support.<br>") + - _("This will corrupt your actuall configuration."), - 80, 10, - Label::ContinueButton(), - Label::CancelButton(), - `focus_no - ) - ) - { - return nil; - } -} - /* main ui function */ any ret = nil; Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp… ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Wed Sep 12 15:21:52 2007 @@ -91,7 +91,31 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ + /* + after merging yast2-mail and yast2-mail-server we have to be + carefull not to corrupt the configuration of the other modul + */ + if( !MailServer::setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) + { + if( + ! Popup::AnyQuestionRichText( + Label::WarningMsg(), + _("You have configured your MTA without LDAP support.<br>") + + _("This modul will configure your MTA with LDAP support.<br>") + + _("This will corrupt your actuall configuration."), + 80, 10, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no + ) + ) + { + return `abort; + } + } + Wizard::RestoreHelp(HELPS["read"]:""); boolean ret = MailServer::Read(); return ret ? `next : `abort; @@ -101,7 +125,8 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(HELPS["write"]:""); boolean ret = MailServer::Write(); return ret ? `next : `abort; Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=40877&r1=4… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Wed Sep 12 15:21:52 2007 @@ -38,6 +38,7 @@ import "Wizard"; import "Popup"; import "Label"; + import "CommandLine"; /* The main () */ y2milestone ("Mail module started"); @@ -151,6 +152,8 @@ /****************/ /* MAIN ROUTINE */ /****************/ + +define any Main() ``{ /* parse arguments */ list args = WFM::Args (); @@ -203,6 +206,35 @@ ret = WFM::CallFunction("mail-standard",args); } +} + +define boolean Setup (map<string, string> options) ``{ + Main(); + return true; +} +/** + * Command line definition + */ +map cmdline = $[ + /* Commandline help title */ + // configuration of hosts + "help" : _("Mail Server Configuration"), + "id" : "mail", + "guihandler": Main, +// "initialize": Host::Read, +// "finish" : Host::Write, // FIXME + "actions" : $[ + "setup" : $[ + /* Commandline command help */ + "help" : _("Setup the Mail Server Configuration"), + "handler" : Setup, + ], + ], +]; + +any ret = CommandLine::Run(cmdline); +y2debug("ret=%1", ret); + /* Finish */ y2milestone ("Mail module finished"); return ret; Modified: trunk/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=4087… ============================================================================== --- trunk/mail/yast2-mail.spec.in (original) +++ trunk/mail/yast2-mail.spec.in Wed Sep 12 15:21:52 2007 @@ -14,14 +14,14 @@ Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp Provides: yast2-config-sendmail yast2-config-sendmail-devel Obsoletes: yast2-config-sendmail yast2-config-sendmail-devel -Provides: yast2-trans-sendmail -Obsoletes: yast2-trans-sendmail -Provides: yast2-config-mail -Obsoletes: yast2-config-mail -Provides: yast2-trans-mail -Obsoletes: yast2-trans-mail -Provides: yast2-mail-server -Obsoletes: yast2-mail-server +Provides: yast2-trans-sendmail = %{version} +Obsoletes: yast2-trans-sendmail <= %{version} +Provides: yast2-config-mail = %{version} +Obsoletes: yast2-config-mail <= %{version} +Provides: yast2-trans-mail = %{version} +Obsoletes: yast2-trans-mail <= %{version} +Provides: yast2-mail-server = %{version} +Obsoletes: yast2-mail-server <= %{version} Conflicts: aaa_base < 10.3 -- 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] r40876 - in /trunk/ruby-bindings: examples/ruby/ycp_from_ruby.rb src/ruby/CMakeLists.txt src/ruby/Y2RubyTypeTerm.cc src/ruby/YCP.cc src/ruby/yast.rb
by dmacvicar＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: dmacvicar Date: Wed Sep 12 15:02:45 2007 New Revision: 40876 URL: http://svn.opensuse.org/viewcvs/yast?rev=40876&view=rev Log: - make the extension a ruby code lib, and make the ruby lib load the native extension (yastx) - move the term builder to the ruby part - make the ruby library add the plugin path Added: trunk/ruby-bindings/src/ruby/yast.rb Modified: trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb trunk/ruby-bindings/src/ruby/CMakeLists.txt trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc trunk/ruby-bindings/src/ruby/YCP.cc Modified: trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ycp_… ============================================================================== --- trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb (original) +++ trunk/ruby-bindings/examples/ruby/ycp_from_ruby.rb Wed Sep 12 15:02:45 2007 @@ -1,5 +1,23 @@ require 'yast' +ui = YaST::Module.new("UI") + + +t = YaST::Builder.new do + VBox do + Label "Now we can call YaST UI from other languages!", "wooho" + PushButton "&So What?", "So what*** what" + end +end +puts t.to_s +exit + +dialog = nil + +puts dialog.class +ui.OpenDialog(dialog) + +exit m = YaST::Module.new("SCR") m.Read(".proc.modules") Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeList… ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Wed Sep 12 15:02:45 2007 @@ -32,14 +32,16 @@ INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) -ADD_LIBRARY( yast SHARED ${yast_ruby_module_SRCS}) -SET_TARGET_PROPERTIES( yast PROPERTIES PREFIX "" ) -TARGET_LINK_LIBRARIES( yast ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_YCP_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_WFM_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_SCR_LIBRARY} ) -TARGET_LINK_LIBRARIES( yast ${RUBY_LIBRARY} ) -INSTALL(TARGETS yast LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) +ADD_LIBRARY( yastx SHARED ${yast_ruby_module_SRCS}) +SET_TARGET_PROPERTIES( yastx PROPERTIES PREFIX "" ) +TARGET_LINK_LIBRARIES( yastx ${YAST_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_YCP_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_WFM_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_SCR_LIBRARY} ) +TARGET_LINK_LIBRARIES( yastx ${RUBY_LIBRARY} ) +INSTALL(TARGETS yastx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/yast.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeTerm.cc Wed Sep 12 15:02:45 2007 @@ -90,6 +90,25 @@ return self; } +static VALUE +ryast_term_add( int argc, VALUE *argv, VALUE self ) +{ + ryast_Term_Wrapper *wrapper; + Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); + + // we should be using rb_scan_args here but I couldn't get it to work. + + // add the remaining YCPTerm arguments + if (argc > 0) + { + int i=0; + for ( ; i<argc; ++i ) + { + wrapper->term->add(rbvalue_2_ycpvalue(argv[i])); + } + } + return self; +} static VALUE ryast_term_allocate(VALUE klass) @@ -100,10 +119,22 @@ return Data_Wrap_Struct (klass, ryast_term_mark, ryast_term_free, wrapper); } + +static VALUE +ryast_term_to_s(VALUE klass) +{ + ryast_Term_Wrapper *wrapper; + Data_Get_Struct(self, ryast_Term_Wrapper, wrapper); + + return rb_str_new2(wrapper->term.toString().c_str()); +} + void ryast_term_init( VALUE super ) { ryast_cTerm = rb_define_class_under( super, "Term", rb_cObject ); rb_define_alloc_func( ryast_cTerm, ryast_term_allocate ); rb_define_method( ryast_cTerm, "initialize", RB_METHOD( ryast_term_initialize ), -1 ); + rb_define_method( ryast_cTerm, "add", RB_METHOD( ryast_term_add ), -1 ); + rb_define_method( ryast_cTerm, "to_s", RB_METHOD( ryast_term_to_s ), 0 ); } Modified: trunk/ruby-bindings/src/ruby/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YCP.cc?re… ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Wed Sep 12 15:02:45 2007 @@ -373,7 +373,7 @@ extern "C" { void - Init_yast() + Init_yastx() { YCPPathSearch::initialize (); Added: trunk/ruby-bindings/src/ruby/yast.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/yast.rb?r… ============================================================================== --- trunk/ruby-bindings/src/ruby/yast.rb (added) +++ trunk/ruby-bindings/src/ruby/yast.rb Wed Sep 12 15:02:45 2007 @@ -0,0 +1,68 @@ +# -----------------------------------------------------------------------\ +# | | +# | __ __ ____ _____ ____ | +# | \ \ / /_ _/ ___|_ _|___ \ | +# | \ V / _` \___ \ | | __) | | +# | | | (_| |___) || | / __/ | +# | |_|\__,_|____/ |_| |_____| | +# | | +# | | +# | ruby language support (C) Novell Inc. | +# \----------------------------------------------------------------------/ +# +# Author: Duncan Mac-Vicar <dmacvicar(a)suse.de> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# + +ENV['LD_LIBRARY_PATH'] = "/usr/lib/YaST2/plugin" + +# Load the native part (.so) +require 'yastx' + +module YaST + + class Builder + # blank slate + instance_methods.each { |m| undef_method m unless (m =~ /^__|instance_eval$/)} + + def initialize(&block) + @buffer = Array.new + @term = nil + instance_eval(&block) + end + + def method_missing(name, *args, &block ) + # puts "hi #{name.to_s} | #{args}" + term = nil + elements = block ? nil : args + @__to_s = nil # invalidate to_s cache + term = YaST::Term(name) + if elements + #puts "here" + @buffer << name << "(" + elements.each do | e | + @buffer << e.to_s + term.add(e) + end + @buffer << ") " + return term + else + # puts "there" + @buffer << name << "(" + r = instance_eval(&block) + term.add(r) if r + @buffer << ") " + end + return term + end + + def to_s + return @buffer.to_s + end + end + +end # module YaST \ No newline at end of file -- 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] r40875 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: kmachalkova Date: Wed Sep 12 14:11:57 2007 New Revision: 40875 URL: http://svn.opensuse.org/viewcvs/yast?rev=40875&view=rev Log: syntax err :( Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 12 14:11:57 2007 @@ -337,7 +337,7 @@ WFM::Execute (.local.bash, sformat ( "mkdir -p '%1'; /bin/cp -p '%2/%3' '%1'", udev_rules_destdir, - udev_rules_srcdir, udev_rules_srcfile); + udev_rules_srcdir, udev_rules_srcfile)); // close and chroot back WFM::SCRClose (new_SCR); -- 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] r40874 - /tags/stable-2_15_76/network/
by kmachalkova＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: kmachalkova Date: Wed Sep 12 14:10:24 2007 New Revision: 40874 URL: http://svn.opensuse.org/viewcvs/yast?rev=40874&view=rev Log: Created tag stable-2_15_76 for network Added: tags/stable-2_15_76/network/ - copied from r40873, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40873 - /tags/stable-2_15_76/
by kmachalkova＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: kmachalkova Date: Wed Sep 12 14:10:12 2007 New Revision: 40873 URL: http://svn.opensuse.org/viewcvs/yast?rev=40873&view=rev Log: Created tag stable-2_15_76 Added: tags/stable-2_15_76/ -- 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] r40872 - /tags/stable-2_15_9/devtools/
by dfiser＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: dfiser Date: Wed Sep 12 14:00:04 2007 New Revision: 40872 URL: http://svn.opensuse.org/viewcvs/yast?rev=40872&view=rev Log: Created tag stable-2_15_9 for devtools Added: tags/stable-2_15_9/devtools/ - copied from r40871, trunk/devtools/ -- 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] r40871 - in /trunk/devtools: VERSION package/yast2-devtools.changes
by dfiser＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: dfiser Date: Wed Sep 12 13:59:25 2007 New Revision: 40871 URL: http://svn.opensuse.org/viewcvs/yast?rev=40871&view=rev Log: v2.15.9 Modified: trunk/devtools/VERSION trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=40871&r1=40… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Wed Sep 12 13:59:25 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed Sep 12 13:59:25 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 12 13:50:10 CEST 2007 - dfiser(a)suse.cz + +- Added support for reading from stdin to showy2log script. +- 2.15.9 + +------------------------------------------------------------------- Wed Aug 29 14:31:04 CEST 2007 - mvidner(a)suse.cz - "make dist" will create only a tar.bz2, not a tar.gz (#289571). -- 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] r40870 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: kmachalkova Date: Wed Sep 12 13:53:46 2007 New Revision: 40870 URL: http://svn.opensuse.org/viewcvs/yast?rev=40870&view=rev Log: version 2.15.76 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40870&r1=408… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Sep 12 13:53:46 2007 @@ -1 +1 @@ -2.15.75 +2.15.76 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Sep 12 13:53:46 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Sep 12 13:49:17 CEST 2007 - kmachalkova(a)suse.cz + +- Do not re-add network devices (incl. loopback) into available + devices list each time Lan::Import() is called (#308132) +- Do not rewrite udev rules file during update (if it already exists + in Installation::destdir) (#293366c#7) +- 2.15.76 + +------------------------------------------------------------------- Fri Sep 7 12:55:00 CEST 2007 - mzugec(a)suse.cz - fixed firmware installation for wlan cards (#307401) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 12 13:53:46 2007 @@ -329,7 +329,7 @@ string udev_rules_srcdir = "/etc/udev/rules.d"; string udev_rules_srcfile = "70-persistent-net.rules"; - string udev_rules_destdir = sformat("%1/%2", String::Quote (Installation::destdir), udev_rules_srcdir); + string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); //Do not create udev_rules_destdir if it already exists (in case of update) //(bug #293366, c#7) -- 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] r40869 - /trunk/devtools/devtools/bin/showy2log
by dfiser＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: dfiser Date: Wed Sep 12 13:50:09 2007 New Revision: 40869 URL: http://svn.opensuse.org/viewcvs/yast?rev=40869&view=rev Log: Added support for reading from stdin to showy2log script. Modified: trunk/devtools/devtools/bin/showy2log Modified: trunk/devtools/devtools/bin/showy2log URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/showy2log?… ============================================================================== --- trunk/devtools/devtools/bin/showy2log (original) +++ trunk/devtools/devtools/bin/showy2log Wed Sep 12 13:50:09 2007 @@ -130,7 +130,8 @@ By default $default_file is processed, unless you're not root and ~/.y2log exists. - -f FILE use FILE as y2log file + -f FILE use FILE as y2log file, if FILE equals to '-' script reads + the log from stdin Filter options: Those options allow to select which message lines are actually printed @@ -240,7 +241,7 @@ $indent = "a" } -if ( ! -r "$file" ) { +if ( ! -r "$file" and "$file" ne "-") { die "Can't read file '$file'"; } @@ -670,14 +671,18 @@ # main # ######################################################################## -my $command = ""; -if ( $#ARGV != -1 ) { - $command .= "$_ " foreach (@ARGV); -} else { - $command = "cat "; +if ("$file" ne "-"){ + my $command = ""; + if ( $#ARGV != -1 ) { + $command .= "$_ " foreach (@ARGV); + } else { + $command = "cat "; + } + open(FILE, "$command '$file'|"); +}else{ + open(FILE, "-"); } -open(FILE, "$command '$file'|"); binmode(FILE, ":utf8"); showlog(); -- 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] r40868 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: kmachalkova Date: Wed Sep 12 13:49:12 2007 New Revision: 40868 URL: http://svn.opensuse.org/viewcvs/yast?rev=40868&view=rev Log: missing '/' Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 12 13:49:12 2007 @@ -329,7 +329,7 @@ string udev_rules_srcdir = "/etc/udev/rules.d"; string udev_rules_srcfile = "70-persistent-net.rules"; - string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); + string udev_rules_destdir = sformat("%1/%2", String::Quote (Installation::destdir), udev_rules_srcdir); //Do not create udev_rules_destdir if it already exists (in case of update) //(bug #293366, c#7) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0