February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63495 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: coolo Date: Mon Feb 28 18:09:33 2011 New Revision: 63495 URL: http://svn.opensuse.org/viewcvs/yast?rev=63495&view=rev Log: it is 114 Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Feb 28 18:09:33 2011 @@ -192,7 +192,7 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_113_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_114_Servers.xml</external_sources_link> <dropped_packages></dropped_packages> <extra_urls config:type="list"> -- 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] r63494 - in /branches/SuSE-Code-11-SP1-Branch/ftp-server: package/yast2-ftp-server.changes src/FtpServer.ycp src/ftp-server.ycp
by jsrain＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: jsrain Date: Mon Feb 28 15:33:45 2011 New Revision: 63494 URL: http://svn.opensuse.org/viewcvs/yast?rev=63494&view=rev Log: fixed command line interface - not polling UI while reading the settings (bnc#660821) Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes branches/SuSE-Code-11-SP1-Branch/ftp-server/src/FtpServer.ycp branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes Mon Feb 28 15:33:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 15 11:18:37 CET 2011 - jsrain(a)suse.cz + +- fixed command line interface - not polling UI while reading the + settings (bnc#660821) + +------------------------------------------------------------------ Mon Nov 30 10:26:55 CET 2009 - juhliarik(a)suse.cz - added fix for typo (bnc#525007) Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/FtpServer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/FtpServer.ycp Mon Feb 28 15:33:45 2011 @@ -839,6 +839,8 @@ * @return boolean true if abort confirmed */ global boolean PollAbort() { + if (Mode::commandline()) + return false; if (UI::PollInput() == `abort) return Abort(); Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp Mon Feb 28 15:33:45 2011 @@ -252,6 +252,7 @@ CommandLine::Print(""); + return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63493 - /tags/stable-2_20_6/installation/
by locilka＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: locilka Date: Mon Feb 28 15:07:17 2011 New Revision: 63493 URL: http://svn.opensuse.org/viewcvs/yast?rev=63493&view=rev Log: Created tag stable-2_20_6 for installation Added: tags/stable-2_20_6/installation/ - copied from r63492, 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] r63492 - in /trunk/installation: VERSION package/yast2-installation.changes src/inst_finish/installation_settings_finish.ycp
by locilka＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: locilka Date: Mon Feb 28 14:57:05 2011 New Revision: 63492 URL: http://svn.opensuse.org/viewcvs/yast?rev=63492&view=rev Log: - Handling disabled installation steps also in Live Installation mode (BNC #675516) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/installation_settings_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63492&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Feb 28 14:57:05 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 28 14:57:05 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 28 14:52:26 CET 2011 - locilka(a)suse.cz + +- Handling disabled installation steps also in Live Installation + mode (BNC #675516) +- 2.20.6 + +------------------------------------------------------------------- Thu Feb 17 13:49:19 CET 2011 - aschnell(a)suse.de - fixed braille support during installation (bnc #672086) Modified: trunk/installation/src/inst_finish/installation_settings_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/ins… ============================================================================== --- trunk/installation/src/inst_finish/installation_settings_finish.ycp (original) +++ trunk/installation/src/inst_finish/installation_settings_finish.ycp Mon Feb 28 14:57:05 2011 @@ -100,7 +100,8 @@ "steps" : 1, // progress step title "title" : _("Writing automatic configuration..."), - "when" : [ `installation, `update, `autoinst ], + // Live Installation has a second stage workflow now (BNC #675516) + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") { Write(); -- 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] r63491 - /branches/tmp/jsuchome/snapper/src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: jsuchome Date: Mon Feb 28 14:15:26 2011 New Revision: 63491 URL: http://svn.opensuse.org/viewcvs/yast?rev=63491&view=rev Log: preserve attributes Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Mon Feb 28 14:15:26 2011 @@ -194,7 +194,7 @@ y2milestone ("copying file %1 to %2 (dir: %3)", orig, file, dir); if (FileUtils::CheckAndCreatePath (dir)) { - SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", orig, file)); + SCR::Execute (.target.bash, sformat ("/bin/cp -a %1 %2", orig, file)); UI::ChangeWidget (`id (`log), `LastLine, file + "\n"); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63490 - in /branches/tmp/jsuchome/snapper: package/yast2-snapper.changes src/Snapper.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 28 Feb '11

28 Feb '11

Author: jsuchome Date: Mon Feb 28 10:38:02 2011 New Revision: 63490 URL: http://svn.opensuse.org/viewcvs/yast?rev=63490&view=rev Log: - added option to compare with arbitrary snapshot Modified: branches/tmp/jsuchome/snapper/package/yast2-snapper.changes branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/package/… ============================================================================== --- branches/tmp/jsuchome/snapper/package/yast2-snapper.changes (original) +++ branches/tmp/jsuchome/snapper/package/yast2-snapper.changes Mon Feb 28 10:38:02 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 28 10:37:40 CET 2011 - jsuchome(a)suse.cz + +- added option to compare with arbitrary snapshot + +------------------------------------------------------------------- Thu Feb 24 14:37:00 CET 2011 - jsuchome(a)suse.cz - tree handling in YCP Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Mon Feb 28 10:38:02 2011 @@ -74,6 +74,8 @@ if (new == 0) file2 = file; + y2milestone ("comparing '%1' and '%2'", file1, file2); + if (FileUtils::Exists (file1) && FileUtils::Exists (file2)) { @@ -101,6 +103,10 @@ { ret["status"] = "created"; } + else + { + ret["status"] = "none"; + } return ret; } @@ -117,7 +123,7 @@ integer id = snapshot["num"]:0; if (id == 0) return; // ignore the 'current system' snapshot["name"] = tostring (id); - y2internal ("snapshot data: %1", snapshot); + y2debug ("snapshot data: %1", snapshot); snapshots = add (snapshots, snapshot); id2index[id] = i; i = i + 1; @@ -185,7 +191,7 @@ string orig = sformat ("%1/%2/snapshot%3", snapshots_path, snapshot_num, file); string dir = substring (file, 0, findlastof (file, "/")); - y2internal ("copying file %1 to %2 (dir: %3)", orig, file, dir); + y2milestone ("copying file %1 to %2 (dir: %3)", orig, file, dir); if (FileUtils::CheckAndCreatePath (dir)) { SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", orig, file)); Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Mon Feb 28 10:38:02 2011 @@ -187,6 +187,15 @@ string pre_date = timestring ("%c", Snapper::snapshots[pre_index,"date"]:0, false); string date = timestring ("%c", snapshot["date"]:0, false); symbol type = snapshot["type"]:`NONE; + list<term> combo_items = []; + foreach (map s, Snapper::snapshots, { + integer id = s["num"]:0; + if (id != snapshot_num) + { + // '%1: %2' means 'ID: description', adapt the order if necessary + combo_items = add (combo_items, `item (`id (id), sformat (_("%1: %2"), id, s["description"]:""))); + } + }); if (!haskey (snapshot, "files")) { @@ -304,6 +313,11 @@ // label content = add (content, `Left (`Heading ("File was not changed"))); } + else if (modification["status"]:"" == "none") + { + // label + content = add (content, `Left (`Heading ("File does not exist in either snapshot"))); + } else { y2warning ("not known: %1", modification); @@ -331,11 +345,25 @@ { UI::ReplaceWidget (`id (`diff_chooser), `HBox (`HSpacing (0.5), `VBox ( `VSpacing (0.2), - // label (above richtext) - `Left (`Label (_("Showing the difference between snapshot and current system"))), + `RadioButtonGroup (`id(`rd), `Left (`HVSquash (`VBox ( + `Left (`RadioButton (`id(`diff_snapshot), `opt (`notify), + // radio button label + _("Show the difference between snapshot and current system"), true)), + `VBox ( + `Left (`RadioButton (`id (`diff_arbitrary), `opt (`notify), + // radio button label, snapshot selection will follow + _("Show the difference between current and selected snapshot:"), false) + ), + `HBox ( + `HSpacing (2), + `Left (`ComboBox (`id (`selection_snapshots), `opt (`notify), "", combo_items)) + ) + ) + )))), `VSpacing () ), `HSpacing (0.5))); show_file_modification (current_file, snapshot_num, 0); + UI::ChangeWidget (`id (`selection_snapshots), `Enabled, false); } else { @@ -525,7 +553,21 @@ } else if (ret == `diff_snapshot) { - show_file_modification (current_file, previous_num, snapshot_num); + if (type == `SINGLE) + { + UI::ChangeWidget (`id (`selection_snapshots), `Enabled, false); + show_file_modification (current_file, snapshot_num, 0); + } + else + { + show_file_modification (current_file, previous_num, snapshot_num); + } + } + else if (ret == `diff_arbitrary || ret == `selection_snapshots) + { + UI::ChangeWidget (`id (`selection_snapshots), `Enabled, true); + integer selected_num = (integer) UI::QueryWidget (`id (`selection_snapshots), `Value); + show_file_modification (current_file, previous_num, selected_num); } else if (ret == `diff_pre_current) { -- 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] r63489 - in /trunk/core/scr/testsuite: Makefile.am y2scr.cc
by mvidner＠svn2.opensuse.org 25 Feb '11

25 Feb '11

Author: mvidner Date: Fri Feb 25 17:19:53 2011 New Revision: 63489 URL: http://svn.opensuse.org/viewcvs/yast?rev=63489&view=rev Log: Remove unneeded binary y2scr From: Stanislav Visnovsky <visnov(a)novell.com> http://lists.opensuse.org/yast-devel/2011-02/msg00168.html patch: 07 Removed: trunk/core/scr/testsuite/y2scr.cc Modified: trunk/core/scr/testsuite/Makefile.am Modified: trunk/core/scr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/scr/testsuite/Makefile.am?r… ============================================================================== --- trunk/core/scr/testsuite/Makefile.am (original) +++ trunk/core/scr/testsuite/Makefile.am Fri Feb 25 17:19:53 2011 @@ -11,7 +11,7 @@ INCLUDES = ${AGENT_INCLUDES} -noinst_PROGRAMS = runscr y2scr +noinst_PROGRAMS = runscr runscr_SOURCES = runscr.cc runscr_LDADD = ${AGENT_LIBADD} @@ -21,10 +21,3 @@ ../src/libpy2scr.la \ -Xlinker --no-whole-archive -y2scr_SOURCES = y2scr.cc -y2scr_LDADD = ${AGENT_LIBADD} -y2scr_LDFLAGS = \ - -Xlinker --whole-archive \ - $(top_builddir)/agent-dummy/src/libpy2ag_dummy.la \ - ../src/libpy2scr.la \ - -Xlinker --no-whole-archive -- 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] r63488 - in /trunk/core: agent-process/src/ base/tools/tty_wrapper/ liby2util-r/src/ liby2util-r/src/include/y2util/
by mvidner＠svn2.opensuse.org 25 Feb '11

25 Feb '11

Author: mvidner Date: Fri Feb 25 17:15:43 2011 New Revision: 63488 URL: http://svn.opensuse.org/viewcvs/yast?rev=63488&view=rev Log: Move Process library class to lib2util-r. The Process class is a general-purpose implementation for wrapping a process invocation. Locating it to the library instead of a specific agent allows to use it from other binaries (tty-wrapper in particular) (it was using it anyway but this is slightly cleaner --mvidner) From: Stanislav Visnovsky <visnov(a)novell.com> http://lists.opensuse.org/yast-devel/2011-02/msg00168.html patch: 03, 04 Added: trunk/core/liby2util-r/src/Process.cc trunk/core/liby2util-r/src/include/y2util/Process.h Removed: trunk/core/agent-process/src/Process.cc trunk/core/agent-process/src/Process.h Modified: trunk/core/agent-process/src/Makefile.am trunk/core/agent-process/src/ProcessAgent.cc trunk/core/base/tools/tty_wrapper/Makefile.am trunk/core/base/tools/tty_wrapper/tty_wrapper.cc trunk/core/liby2util-r/src/Makefile.am Modified: trunk/core/agent-process/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/src/Makefile.… ============================================================================== --- trunk/core/agent-process/src/Makefile.am (original) +++ trunk/core/agent-process/src/Makefile.am Fri Feb 25 17:15:43 2011 @@ -9,9 +9,7 @@ liby2ag_process_la_SOURCES = \ ProcessAgent.cc \ - ProcessAgent.h \ - Process.cc \ - Process.h + ProcessAgent.h liby2ag_process_la_LDFLAGS = -version-info 2:0 liby2ag_process_la_LIBADD = @AGENT_LIBADD@ Modified: trunk/core/agent-process/src/ProcessAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/src/ProcessAg… ============================================================================== --- trunk/core/agent-process/src/ProcessAgent.cc (original) +++ trunk/core/agent-process/src/ProcessAgent.cc Fri Feb 25 17:15:43 2011 @@ -27,7 +27,7 @@ */ #include "ProcessAgent.h" -#include "Process.h" +#include <y2util/Process.h> #include <y2util/ExternalProgram.h> Modified: trunk/core/base/tools/tty_wrapper/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/base/tools/tty_wrapper/Make… ============================================================================== --- trunk/core/base/tools/tty_wrapper/Makefile.am (original) +++ trunk/core/base/tools/tty_wrapper/Makefile.am Fri Feb 25 17:15:43 2011 @@ -8,7 +8,8 @@ tty_wrapper_SOURCES = tty_wrapper.cc -tty_wrapper_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/agent-process/src +tty_wrapper_CPPFLAGS = $(AM_CPPFLAGS) -tty_wrapper_LDADD = $(top_builddir)/agent-process/src/libpy2ag_process.la +tty_wrapper_LDADD = -ly2util +tty_wrapper_LDFLAGS = -L$(srcdir)/../../../liby2util-r/src -L$(libdir) Modified: trunk/core/base/tools/tty_wrapper/tty_wrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/base/tools/tty_wrapper/tty_… ============================================================================== --- trunk/core/base/tools/tty_wrapper/tty_wrapper.cc (original) +++ trunk/core/base/tools/tty_wrapper/tty_wrapper.cc Fri Feb 25 17:15:43 2011 @@ -30,7 +30,7 @@ */ -#include "Process.h" +#include <y2util/Process.h> #include <iostream> extern "C" @@ -40,7 +40,6 @@ #include <errno.h> } - // use atomic type in signal handler static sig_atomic_t finish = false; Modified: trunk/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Makefile.am… ============================================================================== --- trunk/core/liby2util-r/src/Makefile.am (original) +++ trunk/core/liby2util-r/src/Makefile.am Fri Feb 25 17:15:43 2011 @@ -23,7 +23,8 @@ miniini.cc \ stringutil.cc \ y2log.cc \ - y2changes.cc + y2changes.cc \ + Process.cc liby2util_la_LDFLAGS = -version-info 4:0:0 Added: trunk/core/liby2util-r/src/Process.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Process.cc?… ============================================================================== --- trunk/core/liby2util-r/src/Process.cc (added) +++ trunk/core/liby2util-r/src/Process.cc Fri Feb 25 17:15:43 2011 @@ -0,0 +1,249 @@ +/* ProcessAgent.cc + * + * ------------------------------------------------------------------------------ + * Copyright (c) 2008 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + * + * Implementation of class Process. + * + * Authors: Ladislav SlezÃ¡k <lslezak(a)novell.com> + * + * $Id: ProcessAgent.cc 27914 2006-02-13 14:32:08Z locilka $ + */ + +#include "y2util/Process.h" + +#include <signal.h> +#include <fcntl.h> +#include <errno.h> +#include <cstring> +#include <y2util/Y2SLog.h> + + +/** + * Destructor + */ +Process::~Process() +{ + if (running()) + { + MIL << "Terminating running process '" << getpid() << "'..." << std::endl; + kill(); + } +} + +// send a signal +bool Process::kill(int sig) +{ + if (getpid() > 0) + { + return ::kill(getpid(), sig) == 0; + } + + return false; +} + +// send SIGKILL +bool Process::kill() +{ + return ExternalProgram::kill(); +} + +void Process::BufferNewStdoutLines () +{ + const std::string new_output = receiveUpto('\n'); + stdout_buffer += new_output; +} + +// read a line from stdout +std::string Process::readLine() +{ + BufferNewStdoutLines(); + + return GetLineFromBuffer(stdout_buffer); +} + +// return whether stdout buffer contains any (finished) line +bool Process::anyLineInStdout() +{ + BufferNewStdoutLines(); + + return IsAnyLineInBuffer(stdout_buffer); +} + +void Process::readStdoutToBuffer() +{ + const size_t b_size = 4096; + char buffer[b_size]; + size_t read; + + do + { + read = receive(buffer, b_size); + stdout_buffer.append(buffer, read); + } + while(read == b_size); +} + +// read stdout and return the data +std::string Process::read() +{ + readStdoutToBuffer(); + + std::string ret(stdout_buffer); + + stdout_buffer.clear(); + + return ret; +} + +// read data from a fd to a buffer +void Process::readStderrToBuffer() +{ + if (!stderr_output) + { + ERR << "stderr output is not open!" << std::endl; + return; + } + + const int b_size = 4096; + char buffer[b_size]; + int len; + + do + { + len = ::fread(buffer, 1, b_size, stderr_output); + + if (len > 0) + { + stderr_buffer.append(buffer, len); + } + } + while(len == b_size); +} + +// cut off the first line from a buffer and return it +std::string Process::GetLineFromBuffer(std::string &buffer) +{ + // find end of the first line + std::string::size_type line_pos = buffer.find("\n"); + + // a line found? + if (line_pos != std::string::npos) + { + // remove the line from bufer and return it + std::string ret(buffer, 0, line_pos + 1); + buffer.erase(0, line_pos + 1); + + return ret; + } + + // no new line, return empty string + return std::string(); +} + +// returns whether the buffer is empty +bool Process::IsAnyLineInBuffer(const std::string &buffer) +{ + return buffer.empty(); +} + +// read a line from stderr +std::string Process::readErrLine() +{ + readStderrToBuffer(); + + return GetLineFromBuffer(stderr_buffer); +} + +// read data from stderr +std::string Process::readErr() +{ + // read from stderr to the buffer + readStderrToBuffer(); + + // return the buffer and clear it + std::string ret(stderr_buffer); + + stderr_buffer.clear(); + + return ret; +} + +// set the filedscriptor to unblocked mode +void UnblockFD(int fd) +{ + // get the current flags + int flags = ::fcntl(fd,F_GETFL); + + if (flags == -1) + { + ERR << strerror(errno) << std::endl; return; + } + + // set the non-blocking flag + flags = flags | O_NONBLOCK; + + // set the updated flags + flags = ::fcntl(fd,F_SETFL,flags); + + if (flags == -1) + { + ERR << strerror(errno) << std::endl; return; + } +} + +// create a pipe for stderr output +int Process::create_stderr_pipes() +{ + int stderr_pipes[2]; + + // create a pair of pipes + if (pipe(stderr_pipes) != 0) + { + // return current stderr + return 2; + } + + // set the stderr pipe to non-blocking mode + UnblockFD(stderr_pipes[0]); + + stderr_output = ::fdopen(stderr_pipes[0], "r"); + + // return fd for writing + return stderr_pipes[1]; +} + +int Process::closeAll() +{ + if (!stderr_output) + { + // close stderr pipe + ::fclose(stderr_output); + + stderr_output = NULL; + } + + return ExternalProgram::close(); +} + +FILE* Process::errorFile() +{ + return stderr_output; +} + Added: trunk/core/liby2util-r/src/include/y2util/Process.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2u… ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/Process.h (added) +++ trunk/core/liby2util-r/src/include/y2util/Process.h Fri Feb 25 17:15:43 2011 @@ -0,0 +1,156 @@ +/* Process.h + * + * ------------------------------------------------------------------------------ + * Copyright (c) 2008 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + * + * Class Process + * + * Authors: Ladislav SlezÃ¡k <lslezak(a)novell.com> + * + * $Id: Process.h 57029 2009-04-29 11:04:19Z lslezak $ + */ + +#ifndef Process_h +#define Process_h + +#include <y2util/ExternalProgram.h> + +/** + * @short Execute a program and give access to its io + * An object of this class encapsulates the execution of + * an external program. It starts the program using fork + * and some exec.. call, gives you access to the program's + * stdio/stderr and closes the program after use. + */ +class Process: public ExternalProgram +{ + +private: + + std::string stdout_buffer; // buffer for stdout + std::string stderr_buffer; // buffer for stderr + + FILE *stderr_output; + +private: + + // disable copy ctor and operator= + Process(const Process&); + Process& operator=(const Process&); + + // create a pipe for stderr, return the end for writing + int create_stderr_pipes(); + + // a helper function + std::string GetLineFromBuffer(std::string &buffer); + + // a helper function + // reads the new stdout lines and adds them to stdout buffer + void BufferNewStdoutLines(); + + // checks emptines of the stdout buffer + bool IsAnyLineInBuffer(const std::string &buffer); + +public: + + /** + * Start the external program by using the shell <tt>/bin/sh<tt> + * with the option <tt>-c</tt>. You can use io direction symbols < and >. + * @param commandline a shell commandline that is appended to + * <tt>/bin/sh -c</tt>. + * @param default_locale whether to set LC_ALL=C before starting + * @param use_pty start the process in a terminal + */ + Process(const std::string &commandline, bool use_pty = false, bool default_locale = false, bool pty_trans = true) + : ExternalProgram(commandline, Stderr_To_FileDesc, + use_pty, create_stderr_pipes(), default_locale, "", pty_trans), stderr_output(NULL) + {} + + /** + * Start an external program by giving the arguments as an arry of char *pointers. + * If environment is provided, variables will be added to the childs environment, + * overwriting existing ones. + */ + + Process(const char *const *argv, const Environment &environment, bool use_pty = false, bool default_locale = false, bool pty_trans = true) + : ExternalProgram(argv, environment, Stderr_To_FileDesc, + use_pty, create_stderr_pipes(), default_locale, "", pty_trans) + {} + + + ~Process(); + + /** + * Send a signal + */ + bool kill(int sig); + + /** + * Send SIGKILL + */ + bool kill(); + + /** + * Read a line from stdout + */ + std::string readLine(); + + /** + * Read characters from stdout (not line oriented) + */ + std::string read(); + + /** + * Read a line from stderr + */ + std::string readErrLine(); + + /** + * Read characters from stderr (not line oriented) + */ + std::string readErr(); + + /** + * Close all input/output filedescriptors + */ + int closeAll(); + + /** + * Read stdout to the internal buffer (can unblock the process) + */ + void readStdoutToBuffer(); + + /** + * Read stderr to the internal buffer (can unblock the process) + */ + void readStderrToBuffer(); + + /** + * Read whether there are some buffered lines + */ + bool anyLineInStdout(); + + /** + * Return the stderror stream + */ + FILE* errorFile(); + +}; + +#endif // Process_h -- 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] r63487 - /trunk/core/wfm/testsuite/tests/runtest.sh
by mvidner＠svn2.opensuse.org 25 Feb '11

25 Feb '11

Author: mvidner Date: Fri Feb 25 17:11:40 2011 New Revision: 63487 URL: http://svn.opensuse.org/viewcvs/yast?rev=63487&view=rev Log: Make test runs robust by unsetting also LANGUAGE and LC_MESSAGES. Modified: trunk/core/wfm/testsuite/tests/runtest.sh (contents, props changed) Modified: trunk/core/wfm/testsuite/tests/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/wfm/testsuite/tests/runtest… ============================================================================== Binary files - no diff available. -- 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] r63486 - in /trunk/core/scr/src: Makefile.am scr.cc
by mvidner＠svn2.opensuse.org 25 Feb '11

25 Feb '11

Author: mvidner Date: Fri Feb 25 16:43:39 2011 New Revision: 63486 URL: http://svn.opensuse.org/viewcvs/yast?rev=63486&view=rev Log: Do not build 'scr' binary The binary is build here and also in base/ directory. Because of build sequence, base/ binary will win and overwrite this binary. Author: Stanislav Visnovsky <visnov(a)novell.com> http://lists.opensuse.org/yast-devel/2011-02/msg00168.html patch 01, 02 Removed: trunk/core/scr/src/scr.cc Modified: trunk/core/scr/src/Makefile.am Modified: trunk/core/scr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/scr/src/Makefile.am?rev=634… ============================================================================== --- trunk/core/scr/src/Makefile.am (original) +++ trunk/core/scr/src/Makefile.am Fri Feb 25 16:43:39 2011 @@ -5,20 +5,6 @@ AM_CXXFLAGS = -DY2LOG=\"scr\" -DSUSEVERSION=\"${SUSEVERSION}\" serversdir = $(execcompdir)/servers -servers_PROGRAMS = scr - -scr_SOURCES = \ - scr.cc - -scr_LDADD = ${AGENT_LIBADD} \ - $(top_builddir)/liby2/src/liby2.la - -scr_DEPENDENCIES = libpy2scr.la - -scr_LDFLAGS = \ - -Xlinker --whole-archive \ - libpy2scr.la \ - -Xlinker --no-whole-archive plugin_LTLIBRARIES = libpy2scr.la -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0