March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45214 - /trunk/ycp-ui-bindings/examples/Tree2.ycp
by sh-sh-sh＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: sh-sh-sh Date: Wed Mar 5 15:25:58 2008 New Revision: 45214 URL: http://svn.opensuse.org/viewcvs/yast?rev=45214&view=rev Log: extended example Modified: trunk/ycp-ui-bindings/examples/Tree2.ycp Modified: trunk/ycp-ui-bindings/examples/Tree2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Tree2.y… ============================================================================== --- trunk/ycp-ui-bindings/examples/Tree2.ycp (original) +++ trunk/ycp-ui-bindings/examples/Tree2.ycp Wed Mar 5 15:25:58 2008 @@ -60,9 +60,10 @@ ) ] ), `HBox( - `PushButton(`id(`sel_opt), `opt(`hstretch), "/&opt" ), - `PushButton(`id(`sel_usr), `opt(`hstretch), "/&usr" ), - `PushButton(`id(`sel_usr_local), `opt(`hstretch), "/usr/&local" ) + `PushButton(`id(`sel_opt ), `opt(`hstretch), "/&opt" ), + `PushButton(`id(`sel_usr ), `opt(`hstretch), "/&usr" ), + `PushButton(`id(`sel_usr_local ), `opt(`hstretch), "/usr/&local" ), + `PushButton(`id(`none ), `opt(`hstretch), "none" ) ), `HBox( `Label("Current Value:"), @@ -76,12 +77,14 @@ repeat { + y2debug( "Waiting for UserInput()" ); id = UI::UserInput(); - if ( id == `sel_usr) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr" ); - else if ( id == `sel_usr_local) UI::ChangeWidget(`dest_dir, `CurrentItem, `usr_local ); - else if ( id == `sel_opt) UI::ChangeWidget(`dest_dir, `CurrentItem, `opt ); - else if ( id == `dest_dir) + if ( id == `sel_usr ) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr" ); + else if ( id == `sel_usr_local ) UI::ChangeWidget(`dest_dir, `CurrentItem, `usr_local ); + else if ( id == `sel_opt ) UI::ChangeWidget(`dest_dir, `CurrentItem, `opt ); + else if ( id == `none ) UI::ChangeWidget(`dest_dir, `CurrentItem, nil ); + else if ( id == `dest_dir ) { UI::ChangeWidget(`echo, `Value, ""); any current_dir = UI::QueryWidget(`dest_dir, `CurrentItem); -- 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] r45213 - /trunk/qt/src/YQTree.cc
by sh-sh-sh＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: sh-sh-sh Date: Wed Mar 5 14:16:08 2008 New Revision: 45213 URL: http://svn.opensuse.org/viewcvs/yast?rev=45213&view=rev Log: consistent naming Modified: trunk/qt/src/YQTree.cc Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=45213&r1=45… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Wed Mar 5 14:16:08 2008 @@ -59,25 +59,25 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listView = new QTreeWidget( this ); - YUI_CHECK_NEW( _qt_listView ); - layout->addWidget( _qt_listView ); - - // _qt_listView->setHeaderLabel(""); - // _qt_listView->addColumn( "" ); - _qt_listView->header()->hide(); - // _qt_listView->setHeader(0L); - _qt_listView->setRootIsDecorated ( true ); + _qt_treeWidget = new QTreeWidget( this ); + YUI_CHECK_NEW( _qt_treeWidget ); + layout->addWidget( _qt_treeWidget ); + + // _qt_treeWidget->setHeaderLabel(""); + // _qt_treeWidget->addColumn( "" ); + _qt_treeWidget->header()->hide(); + // _qt_treeWidget->setHeader(0L); + _qt_treeWidget->setRootIsDecorated ( true ); - _caption->setBuddy ( _qt_listView ); + _caption->setBuddy ( _qt_treeWidget ); - connect( _qt_listView, SIGNAL( itemSelectionChanged () ), + connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ), this, SLOT ( slotSelectionChanged () ) ); - connect( _qt_listView, SIGNAL( itemActivated ( QTreeWidgetItem * , int ) ), + connect( _qt_treeWidget, SIGNAL( itemActivated ( QTreeWidgetItem * , int ) ), this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); - connect( _qt_listView, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ), + connect( _qt_treeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ), this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); } @@ -99,8 +99,8 @@ { // yuiDebug() << "Rebuilding tree" << endl; - YQSignalBlocker sigBlocker( _qt_listView ); - _qt_listView->clear(); + YQSignalBlocker sigBlocker( _qt_treeWidget ); + _qt_treeWidget->clear(); buildDisplayTree( 0, itemsBegin(), itemsEnd() ); } @@ -118,7 +118,7 @@ if ( parentItem ) clone = new YQTreeItem( this, parentItem, orig, _nextSerialNo++ ); else - clone = new YQTreeItem( this, _qt_listView, orig, _nextSerialNo++ ); + clone = new YQTreeItem( this, _qt_treeWidget, orig, _nextSerialNo++ ); YUI_CHECK_NEW( clone ); @@ -130,7 +130,7 @@ void YQTree::selectItem( YItem * yItem, bool selected ) { - YQSignalBlocker sigBlocker( _qt_listView ); + YQSignalBlocker sigBlocker( _qt_treeWidget ); YTreeItem * treeItem = dynamic_cast<YTreeItem *> (yItem); YUI_CHECK_PTR( treeItem ); @@ -138,7 +138,7 @@ YQTreeItem * yqTreeItem = (YQTreeItem *) treeItem->data(); YUI_CHECK_PTR( yqTreeItem ); - if ( ! selected && yqTreeItem == _qt_listView->currentItem() ) + if ( ! selected && yqTreeItem == _qt_treeWidget->currentItem() ) { deselectAllItems(); } @@ -155,7 +155,7 @@ { if ( item ) { - YQSignalBlocker sigBlocker( _qt_listView ); + YQSignalBlocker sigBlocker( _qt_treeWidget ); item->setSelected( true ); openBranch( item ); @@ -178,25 +178,25 @@ void YQTree::deselectAllItems() { - YQSignalBlocker sigBlocker( _qt_listView ); + YQSignalBlocker sigBlocker( _qt_treeWidget ); YTree::deselectAllItems(); - _qt_listView->clearSelection(); + _qt_treeWidget->clearSelection(); } void YQTree::deleteAllItems() { - YQSignalBlocker sigBlocker( _qt_listView ); + YQSignalBlocker sigBlocker( _qt_treeWidget ); - _qt_listView->clear(); + _qt_treeWidget->clear(); YTree::deleteAllItems(); } void YQTree::slotSelectionChanged( ) { - QList<QTreeWidgetItem *> items = _qt_listView->selectedItems (); + QList<QTreeWidgetItem *> items = _qt_treeWidget->selectedItems (); QTreeWidgetItem *qItem = items.first(); selectItem( dynamic_cast<YQTreeItem *> (qItem) ); @@ -241,14 +241,14 @@ void YQTree::setEnabled( bool enabled ) { _caption->setEnabled( enabled ); - _qt_listView->setEnabled( enabled ); + _qt_treeWidget->setEnabled( enabled ); YWidget::setEnabled( enabled ); } bool YQTree::setKeyboardFocus() { - _qt_listView->setFocus(); + _qt_treeWidget->setFocus(); return true; } -- 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] r45212 - in /trunk/qt/src: YQTree.cc YQTree.h
by sh-sh-sh＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: sh-sh-sh Date: Wed Mar 5 14:11:40 2008 New Revision: 45212 URL: http://svn.opensuse.org/viewcvs/yast?rev=45212&view=rev Log: consistent naming Modified: trunk/qt/src/YQTree.cc trunk/qt/src/YQTree.h Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=45212&r1=45… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Wed Mar 5 14:11:40 2008 @@ -63,8 +63,8 @@ YUI_CHECK_NEW( _qt_listView ); layout->addWidget( _qt_listView ); - //_qt_listView->setHeaderLabel(""); -// _qt_listView->addColumn( "" ); + // _qt_listView->setHeaderLabel(""); + // _qt_listView->addColumn( "" ); _qt_listView->header()->hide(); // _qt_listView->setHeader(0L); _qt_listView->setRootIsDecorated ( true ); Modified: trunk/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.h?rev=45212&r1=452… ============================================================================== --- trunk/qt/src/YQTree.h (original) +++ trunk/qt/src/YQTree.h Wed Mar 5 14:11:40 2008 @@ -161,7 +161,7 @@ // YQWidgetCaption * _caption; - QTreeWidget * _qt_listView; + QTreeWidget * _qt_treeWidget; int _nextSerialNo; }; -- 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] r45211 - /trunk/core/yast2-core.spec.in
by coolo＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: coolo Date: Wed Mar 5 14:08:49 2008 New Revision: 45211 URL: http://svn.opensuse.org/viewcvs/yast?rev=45211&view=rev Log: I'm aware it's not exactly requireing these, but it makes updating a yast devel system easier Modified: trunk/core/yast2-core.spec.in Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=4521… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Wed Mar 5 14:08:49 2008 @@ -36,6 +36,7 @@ Obsoletes: liby2util-devel < 2.16.1 Requires: libxcrypt-devel hwinfo-devel Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils +Requires: yast2-libyui-devel yast2-ycp-ui-bindings-devel # for FlexLexer.h; I think that this dependency could be made # private but it seems not worth the effort Requires: flex -- 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] r45210 - /trunk/qt/src/YQUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: sh-sh-sh Date: Wed Mar 5 14:08:41 2008 New Revision: 45210 URL: http://svn.opensuse.org/viewcvs/yast?rev=45210&view=rev Log: fixed logging Modified: trunk/qt/src/YQUI_builtins.cc Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=4521… ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Wed Mar 5 14:08:41 2008 @@ -261,9 +261,7 @@ if ( okButtonPressed ) { YUI::enableDebugLogging( result.endsWith( "on" ) ); - yuiMilestone() << "Changing logging: <<" << result - << " UI Debug logging: " << YUI::debugLoggingEnabled() - << endl; + yuiMilestone() << "Changing logging: " << result << endl; } } -- 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] r45209 - /tags/stable-2_16_2/backup/
by locilka＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: locilka Date: Wed Mar 5 13:21:30 2008 New Revision: 45209 URL: http://svn.opensuse.org/viewcvs/yast?rev=45209&view=rev Log: Created tag stable-2_16_2 for backup Added: tags/stable-2_16_2/backup/ - copied from r45208, trunk/backup/ -- 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] r45208 - in /trunk/backup: ./ package/ src/ src/scripts/
by locilka＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: locilka Date: Wed Mar 5 13:09:30 2008 New Revision: 45208 URL: http://svn.opensuse.org/viewcvs/yast?rev=45208&view=rev Log: - Adapted to a new .process SCR agent. - 2.16.2 Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/Backup.ycp trunk/backup/src/backup.ycp trunk/backup/src/backup_get_packages.ycp trunk/backup/src/functions.ycp trunk/backup/src/scripts/backup_archive.pl trunk/backup/src/ui.ycp trunk/backup/yast2-backup.spec.in Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=45208&r1=4520… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Wed Mar 5 13:09:30 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Wed Mar 5 13:09:30 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 5 10:27:15 CET 2008 - locilka(a)suse.cz + +- Adapted to a new .process SCR agent. +- 2.16.2 + +------------------------------------------------------------------- Tue Dec 11 12:54:50 CET 2007 - locilka(a)suse.cz - UI mode 'testsuite' is now 'UI' (#347534). Modified: trunk/backup/src/Backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/Backup.ycp?rev=45208&… ============================================================================== --- trunk/backup/src/Backup.ycp (original) +++ trunk/backup/src/Backup.ycp Wed Mar 5 13:09:30 2008 @@ -426,11 +426,17 @@ script_options = script_options + " --no-md5"; } - // add widget file option - script_options = script_options + " --widget-file " + ((string)SCR::Read(.target.tmpdir)) + "/items.ycp"; + // if (display files before archiving them) + if (display) { + y2milestone ("Files files will be displayed before archiving"); + // add widget file option + script_options = script_options + " --widget-file " + ((string)SCR::Read(.target.tmpdir)) + "/items.ycp"; - // add items list option - script_options = script_options + " --list-file " + ((string)SCR::Read(.target.tmpdir)) + "/items-list.ycp"; + // add items list option + script_options = script_options + " --list-file " + ((string)SCR::Read(.target.tmpdir)) + "/items-list.ycp"; + } else { + y2milestone ("Displaying files will be skipped"); + } // add package verification option script_options = script_options + " --pkg-verification"; Modified: trunk/backup/src/backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/backup.ycp?rev=45208&… ============================================================================== --- trunk/backup/src/backup.ycp (original) +++ trunk/backup/src/backup.ycp Wed Mar 5 13:09:30 2008 @@ -153,7 +153,7 @@ // create wizard dialog Wizard::CreateDialog(); // set icon - Wizard::SetDesktopIcon("backup"); + Wizard::SetTitleIcon("backup"); } Backup::ReadBackupProfiles(); Modified: trunk/backup/src/backup_get_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/backup_get_packages.y… ============================================================================== --- trunk/backup/src/backup_get_packages.ycp (original) +++ trunk/backup/src/backup_get_packages.ycp Wed Mar 5 13:09:30 2008 @@ -29,8 +29,11 @@ y2milestone("Reading packages available on the installation sources..."); string filename = nil; - if (is(WFM::Args(0), string)) { - filename = (string) WFM::Args (0); + list args = WFM::Args(); + y2milestone ("Args: %1", args); + + if (args[0]:nil != nil && is(args[0]:"", string)) { + filename = (string) args[0]:""; } else { y2error ("Wrong parameter for script"); return false; @@ -43,14 +46,16 @@ } Pkg::TargetInitialize ("/"); + Pkg::SourceRestore(); + Pkg::SourceStartManager(true); // list of available enabled installation sources list<integer> sources = Pkg::SourceStartCache(true); - y2debug("availables sources: %1", sources); + y2milestone("availables sources: %1", sources); // list of installed products (last installed is first in the list) list installed_products = Pkg::TargetProducts(); - y2debug("installed products: %1", installed_products); + y2milestone("installed products: %1", installed_products); // installation sources for installed products list<integer> product_sources = []; Modified: trunk/backup/src/functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/functions.ycp?rev=452… ============================================================================== --- trunk/backup/src/functions.ycp (original) +++ trunk/backup/src/functions.ycp Wed Mar 5 13:09:30 2008 @@ -703,6 +703,9 @@ * @return list<string> available packages */ define list <string> GetInstallPackages () { + // function returns empty list + return []; + y2milestone("--- backup_get_packages ---"); // was: return (list <string>) WFM::call("backup_get_packages", []); // bugzilla #224899, saves memory occupied by zypp data (packager) @@ -722,6 +725,7 @@ return []; } + // breaks ncurses string cmd = sformat("%1 backup_get_packages %2 1>/dev/null 2>/dev/null", yastbin, temporary_file); y2milestone ("Running command: '%1'", cmd); map command = (map) SCR::Execute(.target.bash_output, cmd); Modified: trunk/backup/src/scripts/backup_archive.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/scripts/backup_archiv… ============================================================================== --- trunk/backup/src/scripts/backup_archive.pl (original) +++ trunk/backup/src/scripts/backup_archive.pl Wed Mar 5 13:09:30 2008 @@ -490,7 +490,7 @@ print "Creating archive:\n"; } -if (defined open(FILES, $files_info)) +if (open(FILES, $files_info)) { while (my $line = <FILES>) { @@ -597,6 +597,10 @@ close(FILES); } +else +{ + print STDERR "Cannot open list of files to backup"; +} #last package if (defined $opened) Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=45208&r1=4… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Wed Mar 5 13:09:30 2008 @@ -33,7 +33,10 @@ textdomain "backup"; - integer wait_time = 500; // loop delay (in miliseconds) +integer wait_time = 250; // loop delay (in miliseconds) + +// used for the ag_process +integer backup_PID = nil; // variables needed for backup when freezes on ZERO (or almost zero) free space integer waiting_without_output = 0; @@ -92,7 +95,7 @@ y2milestone("Finishing backup..."); return `abort; // !cron mode => ask user - } else if ((boolean) SCR::Read(.background.isrunning)) { + } else if ((boolean) SCR::Read (.process.running, backup_PID)) { if (!Popup::YesNoHeadline( // headline of a popup message _("Warning"), @@ -122,7 +125,7 @@ y2milestone("Finishing backup..."); return `abort; // !cron mode => ask user - } else if ((boolean) SCR::Read(.background.isrunning)) { + } else if ((boolean) SCR::Read (.process.running, backup_PID)) { if (!Popup::YesNoHeadline( // headline of a popup message _("Warning"), @@ -165,7 +168,7 @@ if (AbortConfirmation(abort_question)) { - SCR::Execute(.background.kill, nil); + SCR::Execute (.process.kill, backup_PID); return ret; } else @@ -174,33 +177,25 @@ } } - while ((integer)SCR::Read(.background.newlines) == 0 && (boolean)SCR::Read(.background.output_open)) + if ((boolean) SCR::Read (.process.running, backup_PID)) { sleep(wait); ret = (symbol) UI::PollInput(); - if (ret == `abort || ret == `cancel) - { + if (ret == `abort || ret == `cancel) { ret = `abort; - y2warning("Abort pressed"); + y2warning("Abort pressed"); - if (AbortConfirmation(abort_question)) - { - SCR::Execute(.background.kill, ""); - break; - } - else - { - ret = nil; - } - } - - if (Backup::just_creating_archive) { - CheckFreeSpace(); - ret = EvaluateFreeSpace(ret); - if (ret == `abort) { - break; + if (Backup::just_creating_archive) { + CheckFreeSpace(); + ret = EvaluateFreeSpace (ret); + } else { + if (AbortConfirmation(abort_question)) { + SCR::Execute(.process.kill, backup_PID); + } else { + ret = nil; + } } } } @@ -1682,9 +1677,6 @@ ); } - // set buffer size - SCR::Write(.background.buffer_size, 500); - // read list of available packages at the original installation sources Backup::ReadInstallablePackages(); @@ -1874,19 +1866,26 @@ y2milestone("Search script: %1", Backup::script_get_files + Backup::get_search_script_parameters()); // starting the searching script in the background - boolean started = (boolean)SCR::Execute(.background.run_output, Backup::script_get_files + Backup::get_search_script_parameters()); + backup_PID = (integer) SCR::Execute (.process.start_shell, Backup::script_get_files + Backup::get_search_script_parameters(), $["C_locale":true]); list<string> script_out = [ ]; + boolean started = (backup_PID != nil && backup_PID > 0); + symbol ret = nil; - y2milestone("subprocess started: %1 (PID: %2)", started, (integer)SCR::Read(.background.pid)); + y2milestone ("subprocess started: %1 (PID: %2)", started, backup_PID); if (!started) { // error popup message Report::Error(_("Could not start the search script. Aborting the backup. ")); - y2error("Errors: %1", (list<string>)SCR::Read(.background.newerr)); + line = ""; + while (line != nil) { + line = (string) SCR::Read (.process.read_line_stderr, backup_PID); + y2error ("Error: %1", line); + } + if (Backup::cron_mode) { return `abort; } else { @@ -1897,19 +1896,15 @@ integer search_time = time(); // while background script runs - while(((boolean)SCR::Read(.background.output_open)) || ((integer)SCR::Read(.background.newlines)) > 0) { - script_out = (list<string>)SCR::Read(.background.newout); - - // processing the script output - while (size(script_out) > 0) { - line = script_out[0]:nil; // read line - script_out = remove(script_out, 0); // remove line + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) { + line = (string) SCR::Read (.process.read_line, backup_PID); // read line + while (line != nil) { // reading installed packages until the last package is read if (reading_installed_packages) { Search_ProcessInstalledPackages(); } else { - if (substring(line, 0, size(id_package)) == id_package || substring(line, 0, size(id_complete_package)) == id_complete_package) { + if (substring (line, 0, size(id_package)) == id_package || substring (line, 0, size(id_complete_package)) == id_complete_package) { Search_ChangedPackageFiles(); } else { if (substring(line, 0, size(id_file)) == id_file) { @@ -1928,6 +1923,8 @@ } } } + + line = (string) SCR::Read (.process.read_line, backup_PID); // read line } if (search_no_package) { @@ -1936,19 +1933,18 @@ if (Backup::cron_mode) { // in cron mode only wait for subprocess - while (((integer)SCR::Read(.background.newlines)) == 0 && (boolean)SCR::Read(.background.output_open)) { + while ((string) SCR::Read (.process.read, backup_PID) != nil) { sleep(wait_time); } ret = nil; } else { - ret = waitForUserOrProcess(wait_time, `changed); + ret = waitForUserOrProcess (wait_time, `changed); } if (ret != nil) { return ret; } - } // end of the 'while' backround script runs @@ -1978,24 +1974,13 @@ list package_files_part = []; integer new_files = 0; - while((boolean)SCR::Read(.background.output_open) || ((integer)SCR::Read(.background.newlines)) > 0 || (size(script_out) > 0)) + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) // test of script_out size is needed, because previous while cycle was interrupted and script could exited with no new output... { - if (size(script_out) == 0) - { - script_out = (list<string>)SCR::Read(.background.newout); - } - - // current line index - integer lineidx = 0; - // number of new lines - integer script_out_size = size(script_out); - - while (lineidx < script_out_size) - { - line = script_out[lineidx]:nil; // read line - lineidx = lineidx + 1; + line = (string) SCR::Read (.process.read_line, backup_PID); // read line + if (line == nil) continue; + // ---> if (substring(line, 0, size(id_file)) == id_file) { line = substring(line, size(id_file)); @@ -2061,15 +2046,18 @@ } } } - } + // <--- script_out = []; if (Backup::cron_mode == true) { // in cron mode only wait for subprocess - while (((integer)SCR::Read(.background.newlines)) == 0 && (boolean)SCR::Read(.background.output_open)) + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) { + while ((string) SCR::Read (.process.read, backup_PID) != nil) { + // do nothing + } sleep(wait_time); } @@ -2560,21 +2548,8 @@ // prepare start Backup::PrepareBackup(); - boolean started = (boolean)SCR::Execute(.background.run_output, sformat("%1 %2", Backup::script_create_archive, Backup::get_archive_script_parameters(tmpfile_list, tmpfile_comment))); - - if (!started) - { - // error popup message - Report::Error(_("Could not start archiving script. -Aborting the backup. -")); - return `abort; - } - list<string> script_out = [ ]; - - archived_num = 0; boolean tar_running = false; @@ -2590,10 +2565,35 @@ y2milestone("Creating archive..."); + backup_PID = (integer) SCR::Execute( + .process.start_shell, + sformat("%1 %2 | tee /tee-yast-backup", Backup::script_create_archive, Backup::get_archive_script_parameters(tmpfile_list, tmpfile_comment)), + $["C_locale":true] + ); + boolean started = (backup_PID != nil && backup_PID > 0); + + if (!started) + { + // error popup message + Report::Error(_("Could not start archiving script. +Aborting the backup. +")); + return `abort; + } + Backup::just_creating_archive = true; - while(((boolean)SCR::Read(.background.output_open)) == true || ((integer)(SCR::Read(.background.newlines)) > 0)) + + line = "-- just -- started --"; + // start while + // + // .running might return false + // but there still might be some buffer left + while ((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) { - script_out = (list<string>) SCR::Read(.background.newout); + line = (string) SCR::Read(.process.read_line, backup_PID); + if (line == nil) continue; + + script_out = [line]; // script returned some lines, no check the free space if (size(script_out)>0) { @@ -2812,7 +2812,10 @@ if (Backup::cron_mode) { // in cron mode only wait for subprocess (and free space!) - while ((integer) SCR::Read(.background.newlines) == 0 && (boolean) SCR::Read(.background.output_open) && enough_free_space_tmp && enough_free_space_target) { + while (((boolean) SCR::Read (.process.running, backup_PID) || ! (boolean) SCR::Read (.process.buffer_empty, backup_PID)) && enough_free_space_tmp && enough_free_space_target) { + while ((string) SCR::Read (.process.read_line, backup_PID) != nil) { + // do nothing + } sleep(wait_time); CheckFreeSpace(); } @@ -2836,6 +2839,10 @@ } } + // end while + + y2milestone ("DEBUG: running %1", (boolean) SCR::Read (.process.running, backup_PID)); + y2milestone ("DEBUG: empty %1", (boolean) SCR::Read (.process.buffer_empty, backup_PID)); Backup::selected_files = $[]; Modified: trunk/backup/yast2-backup.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/yast2-backup.spec.in?rev=… ============================================================================== --- trunk/backup/yast2-backup.spec.in (original) +++ trunk/backup/yast2-backup.spec.in Wed Mar 5 13:09:30 2008 @@ -26,8 +26,8 @@ Requires: yast2-nfs-client Requires: yast2-storage -# New mod-UI -Conflicts: yast2-core < 2.15.7 +# .process.buffer_empty +Conflicts: yast2-core < 2.16.10 Recommends: yast2-bootloader Recommends: yast2-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] r45207 - /tags/stable-2_16_40/core/
by locilka＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: locilka Date: Wed Mar 5 12:26:39 2008 New Revision: 45207 URL: http://svn.opensuse.org/viewcvs/yast?rev=45207&view=rev Log: Created tag stable-2_16_40 for core Added: tags/stable-2_16_40/core/ - copied from r45206, trunk/core/ -- 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] r45206 - in /trunk/core: agent-process/testsuite/tests/invalid_paths.err agent-process/testsuite/tests/invalid_values.err agent-process/testsuite/tests/runtest.sh package/yast2-core.changes
by locilka＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: locilka Date: Wed Mar 5 12:21:38 2008 New Revision: 45206 URL: http://svn.opensuse.org/viewcvs/yast?rev=45206&view=rev Log: - Adjusted and fixed process agent testsuite. Modified: trunk/core/agent-process/testsuite/tests/invalid_paths.err trunk/core/agent-process/testsuite/tests/invalid_values.err trunk/core/agent-process/testsuite/tests/runtest.sh trunk/core/package/yast2-core.changes Modified: trunk/core/agent-process/testsuite/tests/invalid_paths.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/invalid_paths.err (original) +++ trunk/core/agent-process/testsuite/tests/invalid_paths.err Wed Mar 5 12:21:38 2008 @@ -1,6 +1,6 @@ -[agent-process] ProcessAgent.cc(Dir):80 Wrong path '.non_existing_path' in Dir(). -[agent-process] ProcessAgent.cc(Read):107 ID of the process is missing -[agent-process] ProcessAgent.cc(Write):243 Unsupported path in Write(): .non_existing_path -[agent-process] ProcessAgent.cc(Execute):460 ID of the process is missing -[agent-process] ProcessAgent.cc(Read):119 Process '123' not found -[agent-process] ProcessAgent.cc(Write):261 Process '123' not found +[agent-process] ProcessAgent.cc(Dir) Wrong path '.non_existing_path' in Dir(). +[agent-process] ProcessAgent.cc(Read) ID of the process is missing +[agent-process] ProcessAgent.cc(Write) Unsupported path in Write(): .non_existing_path +[agent-process] ProcessAgent.cc(Execute) ID of the process is missing +[agent-process] ProcessAgent.cc(Read) Process '123' not found +[agent-process] ProcessAgent.cc(Write) Process '123' not found Modified: trunk/core/agent-process/testsuite/tests/invalid_values.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/invalid_values.err (original) +++ trunk/core/agent-process/testsuite/tests/invalid_values.err Wed Mar 5 12:21:38 2008 @@ -1,2 +1,2 @@ -[agent-process] ProcessAgent.cc(Execute):348 tty option '"invalid"' is not a boolean value -[agent-process] ProcessAgent.cc(Execute):348 tty option '"invalid"' is not a boolean value +[agent-process] ProcessAgent.cc(Execute) tty option '"invalid"' is not a boolean value +[agent-process] ProcessAgent.cc(Execute) tty option '"invalid"' is not a boolean value Modified: trunk/core/agent-process/testsuite/tests/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/runtest.sh (original) +++ trunk/core/agent-process/testsuite/tests/runtest.sh Wed Mar 5 12:21:38 2008 @@ -7,4 +7,10 @@ export Y2DEBUGSHELL=1 # ignore also milestones (they are not constant and logged by liby2util - cannot be simply turned off) -(./run_ag_process -l - $1 >$2) 2>&1 | fgrep -v -e " <0> " -e " <1> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3 +# ignore also line numbers (any change in the core might make the testsuite fail) +(./run_ag_process -l - $1 >$2) 2>&1 | \ + fgrep -v -e " <0> " -e " <1> " | \ + grep -v "^$" | \ + sed 's/^....-..-.. ..:..:.. [^)]*) //g' | \ + sed 's/^$\[[^]]\+\] [^(]\+([^)]\+)$:[0-9]\+ $.*$/\1 \2/g' \ + > $3 Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Wed Mar 5 12:21:38 2008 @@ -3,6 +3,7 @@ - Extended .process agent with 'buffer_empty' function that returns whether the stdout buffer is empty (needed for backup). +- Adjusted and fixed process agent testsuite. - 2.16.40 ------------------------------------------------------------------- -- 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] r45205 - /tags/branch-SLE-10-SP2-2_13_18/registration/
by jdsn＠svn.opensuse.org 05 Mar '08

05 Mar '08

Author: jdsn Date: Wed Mar 5 12:20:51 2008 New Revision: 45205 URL: http://svn.opensuse.org/viewcvs/yast?rev=45205&view=rev Log: Created tag branch-SLE-10-SP2-2_13_18 for registration Added: tags/branch-SLE-10-SP2-2_13_18/registration/ - copied from r45203, branches/SuSE-SLE-10-SP2-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0