December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60101 - in /trunk/control-center/src: CMakeLists.txt main_window.cpp main_window.h
by kmachalkova＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: kmachalkova Date: Mon Dec 14 16:53:52 2009 New Revision: 60101 URL: http://svn.opensuse.org/viewcvs/yast?rev=60101&view=rev Log: Activate log saver Modified: trunk/control-center/src/CMakeLists.txt trunk/control-center/src/main_window.cpp trunk/control-center/src/main_window.h Modified: trunk/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.tx… ============================================================================== --- trunk/control-center/src/CMakeLists.txt (original) +++ trunk/control-center/src/CMakeLists.txt Mon Dec 14 16:53:52 2009 @@ -31,6 +31,8 @@ yqmodulesmodel.cpp yqmodulesproxymodel.cpp + yqsavelogs.cpp + i18n.cpp ) @@ -56,6 +58,8 @@ yqmodulesmodel.h yqmodulesproxymodel.h + yqsavelogs.h + i18n.h ) Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.c… ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Mon Dec 14 16:53:52 2009 @@ -164,9 +164,12 @@ initActions(); addAction( shutdown ); + addAction( saveLogs ); //d->modview->addAction( addToF ); //d->modview->setContextMenuPolicy( Qt::ActionsContextMenu ); + logSaver = new YQSaveLogs(); + setWinTitle(); statusBar()->showMessage( _("Ready") ); @@ -184,6 +187,11 @@ connect( shutdown, SIGNAL( activated()), qApp, SLOT( quit())); + connect( saveLogs, SIGNAL( activated()), logSaver, SLOT( save() )); + + connect( logSaver, SIGNAL( statusMsg( const QString &)), statusBar(), + SLOT( showMessage( const QString &) )); + } void MainWindow::setFullScreen( bool fs ) @@ -200,7 +208,10 @@ { //addToF = new QAction( "Add to Favourites", this ); shutdown = new QAction( this ); - shutdown->setShortcut( ("Ctrl+Q") ); + shutdown->setShortcut( Qt::CTRL + Qt::Key_Q ); + + saveLogs = new QAction( this ); + saveLogs->setShortcut( Qt::SHIFT + Qt::Key_F8); } void MainWindow::slotGroupPressed( const QModelIndex &index ) @@ -378,6 +389,7 @@ MainWindow::~MainWindow() { delete d; + delete logSaver; } #include "main_window.moc" Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h… ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Mon Dec 14 16:53:52 2009 @@ -15,6 +15,7 @@ #include "kcategorizedview.h" #include "kcategorydrawer.h" #include "moduleiconitem.h" +#include "yqsavelogs.h" #include <QMainWindow> @@ -54,6 +55,9 @@ QAction *addToF; QAction *shutdown; + QAction *saveLogs; + + YQSaveLogs *logSaver; void writeSettings(); void readSettings(); -- 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] r60100 - in /trunk/control-center/src: yqsavelogs.cpp yqsavelogs.h
by kmachalkova＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: kmachalkova Date: Mon Dec 14 16:52:10 2009 New Revision: 60100 URL: http://svn.opensuse.org/viewcvs/yast?rev=60100&view=rev Log: Qt4 port of log saver Added: trunk/control-center/src/yqsavelogs.cpp trunk/control-center/src/yqsavelogs.h Added: trunk/control-center/src/yqsavelogs.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqsavelogs.cp… ============================================================================== --- trunk/control-center/src/yqsavelogs.cpp (added) +++ trunk/control-center/src/yqsavelogs.cpp Mon Dec 14 16:52:10 2009 @@ -0,0 +1,178 @@ +/*************************************************************************** + yqsavelogs.cpp - Save YaST Logs + author : tgoettlicher(a)suse.de + ***************************************************************************/ + +/* + Textdomain "control-center" +*/ + +#include "yqsavelogs.h" + +#include <QFileDialog> +#include <QMessageBox> + + +YQSaveLogs::YQSaveLogs() +{ + lock = false; + proc = 0; +} + +YQSaveLogs::~YQSaveLogs() +{ +} + +void YQSaveLogs::save() +{ + + if (lock) + { + QMessageBox::warning( 0, // parent + "Warning", // caption + QString("Logs are written at the moment. Please try again later."), + QMessageBox::Ok | QMessageBox::Default, // button0 + QMessageBox::NoButton, // button1 + QMessageBox::NoButton ); // button2 + return; + } + + SaveLogs(); + +} + + +void YQSaveLogs::saveProcessExited( int exitCode, QProcess::ExitStatus exitStatus ) +{ + if ( exitStatus == QProcess::NormalExit ) + { + emit statusMsg( _("Log files written successfully.") ); + } + else + { + emit statusMsg( _("Couldn't save y2logs.") ); + QMessageBox::warning( 0, // parent + "Error", // caption + QString( "Couldn't save y2logs - " + "exit code %1").arg( exitStatus ), + QMessageBox::Ok | QMessageBox::Default, // button0 + QMessageBox::NoButton, // button1 + QMessageBox::NoButton ); // button2 + } + + + delete proc; + + lock=false; + +} + + +void YQSaveLogs::SaveLogs() +{ + QString fileName = askForSaveFileName( "/tmp/y2logs.tgz", // startWith + "*.tgz *.tar.gz", // filter + "Save y2logs to..." ); // headline + + if ( ! fileName.isEmpty() ) + { + QString saveLogsCommand = "/sbin/save_y2logs"; + QStringList args = QStringList() << fileName; + + if ( access( saveLogsCommand.toAscii(), X_OK ) == 0 ) + { + lock = true; + + proc = new QProcess( this ); + + connect ( proc, SIGNAL(finished( int, QProcess::ExitStatus )), this, + SLOT(saveProcessExited( int, QProcess::ExitStatus ))); + + proc->start( saveLogsCommand, args ); + int result = proc->exitCode(); + + if ( result != 0 ) + { + // unable to start command (errors while running command are handled by saveProcessExited) + + QMessageBox::warning( 0, // parent + "Error", // caption + QString( "Couldn't save y2logs to %1 - " + "exit code %2" ).arg( fileName ).arg( result ), + QMessageBox::Ok | QMessageBox::Default, // button0 + QMessageBox::NoButton, // button1 + QMessageBox::NoButton ); // button2 + + delete proc; + + lock = false; + } + else + { + emit statusMsg( _("Writing log files ...") ); + } + } + else + { + QMessageBox::warning( 0, // parent + "Error", // caption + QString( "Couldn't save y2logs to %1:\n" + "Command %2 not found" ).arg( fileName ).arg( saveLogsCommand ), + QMessageBox::Ok | QMessageBox::Default, // button0 + QMessageBox::NoButton, // button1 + QMessageBox::NoButton ); // button2 + } + } +} + +QString YQSaveLogs::askForSaveFileName( const QString & startWith, + const QString & filter, + const QString & headline ) +{ + QString file_name; + bool try_again = false; + + do + { + // Leave the mouse cursor alone - this function might be called from + // some other widget, not only from AskForSaveFileName(). + + file_name = QFileDialog::getSaveFileName( 0, // parent + headline, // caption + startWith, // initial dir + filter ); + + if ( file_name.isEmpty() ) // this includes file_name.isNull() + return QString::null; + + + if ( access( file_name.toAscii(), F_OK ) == 0 ) // file exists? + { + QString msg; + + if ( access( file_name.toAscii(), W_OK ) == 0 ) + { + // Confirm if the user wishes to overwrite an existing file + msg = ( _( "%1 exists! Really overwrite?" ) ).arg( file_name ); + } + else + { + // Confirm if the user wishes to overwrite a write-protected file %1 + msg = ( _( "%1 exists and is write-protected!\nReally overwrite?" ) ).arg( file_name ); + } + + int button_no = QMessageBox::information( 0, + // Window title for confirmation dialog + _( "Confirm" ), + msg, + _( "C&ontinue" ), + _( "&Cancel" ) ); + try_again = ( button_no != 0 ); + } + + } while ( try_again ); + + return file_name; +} + +#include <yqsavelogs.moc> Added: trunk/control-center/src/yqsavelogs.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqsavelogs.h?… ============================================================================== --- trunk/control-center/src/yqsavelogs.h (added) +++ trunk/control-center/src/yqsavelogs.h Mon Dec 14 16:52:10 2009 @@ -0,0 +1,51 @@ +/*************************************************************************** + yqsavelogs.h - Save YaST Logs + author : tgoettlicher(a)suse.de + ***************************************************************************/ + +#ifndef YQSAVELOGS_H +#define YQSAVELOGS_H + +// include files for QT +#include <QString> +#include <QProcess> + + +// application specific includes +#include "i18n.h" + +/** + * This Class asks for a filename and saves YaST logfies + */ +class YQSaveLogs : public QObject +{ + Q_OBJECT + +public: + + YQSaveLogs(); + ~YQSaveLogs(); + +public slots: + void saveProcessExited( int exitCode, QProcess::ExitStatus exitStatus ); + void save(); + + +protected: + +signals: + void statusMsg( const QString& msg ); + +private: + + bool lock; + QProcess * proc; + + void SaveLogs(); + QString askForSaveFileName( const QString & startWith, + const QString & filter, + const QString & headline ); + +}; +#endif + -- 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] r60099 - /trunk/packager/src/clients/inst_kickoff.ycp
by aschnell＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: aschnell Date: Mon Dec 14 16:44:01 2009 New Revision: 60099 URL: http://svn.opensuse.org/viewcvs/yast?rev=60099&view=rev Log: - removed unused function Modified: trunk/packager/src/clients/inst_kickoff.ycp Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickof… ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Mon Dec 14 16:44:01 2009 @@ -317,10 +317,6 @@ } } - // special logging function for Rendivm - void eat2minestrone (string entry) { - y2milestone (entry); - } /** * Load all network modules. The package sysconfig requires this during -- 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] r60098 - /tags/branch-Code-11-SP1-2_17_33/users/
by jsuchome＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: jsuchome Date: Mon Dec 14 15:38:35 2009 New Revision: 60098 URL: http://svn.opensuse.org/viewcvs/yast?rev=60098&view=rev Log: Created tag branch-Code-11-SP1-2_17_33 for users Added: tags/branch-Code-11-SP1-2_17_33/users/ (props changed) - copied from r60097, branches/SuSE-Code-11-SP1-Branch/users/ -- 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] r60097 - /tags/branch-Code-11-SP1-2_17_33/
by jsuchome＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: jsuchome Date: Mon Dec 14 15:38:32 2009 New Revision: 60097 URL: http://svn.opensuse.org/viewcvs/yast?rev=60097&view=rev Log: Created tag branch-Code-11-SP1-2_17_33 Added: tags/branch-Code-11-SP1-2_17_33/ -- 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] r60096 - in /branches/SuSE-Code-11-SP1-Branch/users: VERSION agent-nis/ag_nis package/yast2-users.changes
by jsuchome＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: jsuchome Date: Mon Dec 14 15:38:28 2009 New Revision: 60096 URL: http://svn.opensuse.org/viewcvs/yast?rev=60096&view=rev Log: - fixed key names in the agent for reading NIS data (bnc#526211) - 2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION branches/SuSE-Code-11-SP1-Branch/users/agent-nis/ag_nis branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Modified: branches/SuSE-Code-11-SP1-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/users/VERSION Mon Dec 14 15:38:28 2009 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-SP1-Branch/users/agent-nis/ag_nis URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/agent-nis/ag_nis (original) +++ branches/SuSE-Code-11-SP1-Branch/users/agent-nis/ag_nis Mon Dec 14 15:38:28 2009 @@ -62,7 +62,7 @@ } $groups{$group_type}{$groupname} = { "cn" => $groupname, - "gidnumber" => $gid, + "gidNumber" => $gid, "userlist" => \%userlist, "type" => $group_type, "more_users" => {} @@ -150,14 +150,14 @@ # such map we would like to export from the read script... $users{$user_type}{$username} = { "cn" => $full, - "homedirectory" => $home, + "homeDirectory" => $home, "uid" => $username, - "uidnumber" => $uid, - "gidnumber" => $gid, - "loginshell" => $shell, + "uidNumber" => $uid, + "gidNumber" => $gid, + "loginShell" => $shell, "groupname" => $groupname, "grouplist" => \%grouplist, - "userpassword" => "x", + "userPassword" => "x", "type" => $user_type }; if (!defined $users_by_uidnumber{$user_type}{$uid}) { Modified: branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/users… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/users/package/yast2-users.changes Mon Dec 14 15:38:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 14 15:28:24 CET 2009 - jsuchome(a)suse.cz + +- fixed key names in the agent for reading NIS data (bnc#526211) +- 2.17.33 + +------------------------------------------------------------------- Fri Dec 4 15:17:21 CET 2009 - jsuchome(a)suse.cz - YaPI: call newaliases after updating aliases (bnc#559135) -- 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] r60095 - /tags/stable-2_19_0/restore/
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 15:19:27 2009 New Revision: 60095 URL: http://svn.opensuse.org/viewcvs/yast?rev=60095&view=rev Log: Created tag stable-2_19_0 for restore Added: tags/stable-2_19_0/restore/ - copied from r60094, trunk/restore/ -- 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] r60094 - in /trunk/restore: VERSION package/yast2-restore.changes
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 15:16:01 2009 New Revision: 60094 URL: http://svn.opensuse.org/viewcvs/yast?rev=60094&view=rev Log: New version Modified: trunk/restore/VERSION trunk/restore/package/yast2-restore.changes Modified: trunk/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/VERSION?rev=60094&r1=600… ============================================================================== --- trunk/restore/VERSION (original) +++ trunk/restore/VERSION Mon Dec 14 15:16:01 2009 @@ -1 +1 @@ -2.18.1 +2.19.0 Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Mon Dec 14 15:16:01 2009 @@ -3,6 +3,7 @@ - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). +- 2.19.0 ------------------------------------------------------------------- Wed Jun 24 15:49:19 CEST 2009 - locilka(a)suse.cz -- 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] r60093 - /tags/branch-Code-11-SP1-2_17_4/restore/
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 15:10:48 2009 New Revision: 60093 URL: http://svn.opensuse.org/viewcvs/yast?rev=60093&view=rev Log: Created tag branch-Code-11-SP1-2_17_4 for restore Added: tags/branch-Code-11-SP1-2_17_4/restore/ (props changed) - copied from r60092, branches/SuSE-Code-11-SP1-Branch/restore/ -- 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] r60092 - in /branches/SuSE-Code-11-SP1-Branch/restore: VERSION package/yast2-restore.changes
by locilka＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: locilka Date: Mon Dec 14 15:10:06 2009 New Revision: 60092 URL: http://svn.opensuse.org/viewcvs/yast?rev=60092&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/restore/VERSION branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes Modified: branches/SuSE-Code-11-SP1-Branch/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/VERSION Mon Dec 14 15:10:06 2009 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/resto… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes Mon Dec 14 15:10:06 2009 @@ -3,6 +3,7 @@ - Fixed restoration of unavailable packages (bnc #553400). - Fixed dialog for selecting packages to restore (bnc #553400). +- 2.17.4 ------------------------------------------------------------------- Wed Jun 24 15:49:19 CEST 2009 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0