June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48087 - /trunk/mail/src/YaPI/MailServer.pm
by varkoly＠svn.opensuse.org 05 Jun '08

05 Jun '08

Author: varkoly Date: Thu Jun 5 12:44:36 2008 New Revision: 48087 URL: http://svn.opensuse.org/viewcvs/yast?rev=48087&view=rev Log: the variable $max_servers in /etc/amavisd.conf must be equal to the max processes in /etc/postfix/master.cf for amavisd. Modified: trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Thu Jun 5 12:44:36 2008 @@ -1327,16 +1327,16 @@ SCR->Execute('.mail.postfix.mastercf.modifyService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '100', - 'options' => { 'content_filter' => 'smtp:[localhost]:10024' } } ); + 'maxproc' => '30', + 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } else { SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '100', - 'options' => { 'content_filter' => 'smtp:[localhost]:10024' } } ); + 'maxproc' => '30', + 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', { 'service' => 'smtps', 'command' => 'smtpd' }); @@ -2771,6 +2771,7 @@ my $aconf = "/etc/amavisd.conf"; my $cconf = "/etc/clamd.conf"; my $clamsock = '/var/lib/clamav/clamd-socket'; + my @CONF = (); if( ! open(IN,$aconf) ) { @@ -2780,8 +2781,10 @@ close(IN); my $isclam = 0; + my $ismax = 0; foreach my $l ( @ACONF ) { + $ismax = 1 if $l =~ s/^\$max_servers = \d+/\$max_servers = 30/; $l =~ s/(.*)/# $1/ if $l =~ /bypass_virus_checks_acl.*=.*qw\( \./; if( $isclam || $l =~ /Clam Antivirus-clamd/ ) { @@ -2793,12 +2796,17 @@ $l =~ s/^(.*\").*(\".*)$/$1$clamsock$2/; } } + push @CONF, $l; + } + if( !$ismax ) + { + push @CONF, '$max_servers = 30;' } if( ! open(OUT,">$aconf.new") ) { return "Error: $!"; } - print OUT @ACONF; + print OUT @CONF; close(OUT); if( ! open(IN,$cconf) ) @@ -2807,18 +2815,20 @@ } my @CCONF = <IN>; close(IN); + @CONF = (); foreach my $l ( @CCONF ) { $l = "LocalSocket $clamsock\n" if $l =~ /LocalSocket/; $l =~ s/(.*)/#$1/ if $l =~ /^TCPSocket/; $l =~ s/(.*)/#$1/ if $l =~ /^TCPAddr/; + push @CONF, $l; } if( ! open(OUT,">$cconf.new") ) { return "Error: $!"; } - print OUT @CCONF; + print OUT @CONF; close(OUT); copy($aconf,"$aconf.bak"); copy($cconf,"$cconf.bak"); -- 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] r48086 - /branches/tmp/sh/ncurses-cleanup/ncurses/src/STATUS
by sh-sh-sh＠svn.opensuse.org 05 Jun '08

05 Jun '08

Author: sh-sh-sh Date: Thu Jun 5 11:55:59 2008 New Revision: 48086 URL: http://svn.opensuse.org/viewcvs/yast?rev=48086&view=rev Log: obsolete Removed: branches/tmp/sh/ncurses-cleanup/ncurses/src/STATUS -- 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] r48085 - /branches/tmp/sh/ncurses-cleanup/ncurses/src/README_mod-ui
by sh-sh-sh＠svn.opensuse.org 05 Jun '08

05 Jun '08

Author: sh-sh-sh Date: Thu Jun 5 11:55:35 2008 New Revision: 48085 URL: http://svn.opensuse.org/viewcvs/yast?rev=48085&view=rev Log: obsolete Removed: branches/tmp/sh/ncurses-cleanup/ncurses/src/README_mod-ui -- 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] r48084 - in /trunk/qt/src: QY2Styler.cc QY2Styler.h YQWizard.cc
by coolo＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: coolo Date: Wed Jun 4 18:11:59 2008 New Revision: 48084 URL: http://svn.opensuse.org/viewcvs/yast?rev=48084&view=rev Log: unregister wizards + some extra paranoia Modified: trunk/qt/src/QY2Styler.cc trunk/qt/src/QY2Styler.h trunk/qt/src/YQWizard.cc Modified: trunk/qt/src/QY2Styler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2Styler.cc?rev=48084&r1… ============================================================================== --- trunk/qt/src/QY2Styler.cc (original) +++ trunk/qt/src/QY2Styler.cc Wed Jun 4 18:11:59 2008 @@ -87,8 +87,14 @@ widget->setStyleSheet( _style ); } +void QY2Styler::unregisterWidget( QWidget *widget ) +{ + _children.remove( widget ); +} + void QY2Styler::registerChildWidget( QWidget *parent, QWidget *widget ) { + qDebug() << "registerChildWidget " << parent << " " << widget; widget->installEventFilter( this ); _children[parent].push_back( widget ); } @@ -101,6 +107,7 @@ void QY2Styler::renderParent( QWidget *wid ) { + qDebug() << "renderParent " << wid << endl; QString name = wid->objectName(); // if the parent does not have a background, this does not make sense @@ -123,6 +130,7 @@ QWidget *child; foreach( child, _children[wid] ) { + qDebug() << "foreach " << child << " " << wid; QString name = child->objectName(); if (! child->isVisible() || _backgrounds[name].pix.isNull() ) @@ -152,6 +160,9 @@ bool QY2Styler::updateRendering( QWidget *wid ) { + if (!wid) + return false; + QString name = wid->objectName(); if ( !_backgrounds.contains( name ) ) @@ -173,6 +184,8 @@ QWidget *parent = wid->parentWidget(); while ( parent && !_children.contains( parent ) ) parent = parent->parentWidget(); + if (!parent) + return false; renderParent( parent ); } else { renderParent( wid ); Modified: trunk/qt/src/QY2Styler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2Styler.h?rev=48084&r1=… ============================================================================== --- trunk/qt/src/QY2Styler.h (original) +++ trunk/qt/src/QY2Styler.h Wed Jun 4 18:11:59 2008 @@ -17,6 +17,7 @@ void setStyleSheet( const QString &file ); QString themeDir() const; void registerWidget( QWidget *widget ); + void unregisterWidget( QWidget *widget ); void registerChildWidget( QWidget *parent, QWidget *widget ); QString textStyle() const { return _textStyle; } Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=48084&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Wed Jun 4 18:11:59 2008 @@ -155,8 +155,9 @@ if ( this == main_wizard ) main_wizard = 0; - if ( _helpDlg ) - delete _helpDlg; + delete _helpDlg; + + QY2Styler::self()->unregisterWidget( this ); } bool YQWizard::isSecondary() const -- 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] r48083 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQMainWinDock.h src/YQWizard.cc
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 18:07:27 2008 New Revision: 48083 URL: http://svn.opensuse.org/viewcvs/yast?rev=48083&view=rev Log: reverted last checkin (except some debug logging) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQMainWinDock.h trunk/qt/src/YQWizard.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=48083&r1=48… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Jun 4 18:07:27 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "54") +SET(VERSION_PATCH "53") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Jun 4 18:07:27 2008 @@ -1,11 +1,4 @@ ------------------------------------------------------------------- -Wed Jun 4 16:36:08 CEST 2008 - sh(a)suse.de - -- Prevent segfault for secondary wizards: - Call YQMainWinDock::resizeVisibleChild() indirectly via - single shot timer to avoid calling virtual methods in constructor - -------------------------------------------------------------------- Tue Jun 3 13:42:19 CEST 2008 - tgoettlicher(a)suse.de - limited bar width in disk usage list to 100% Modified: trunk/qt/src/YQMainWinDock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.h?rev=48083… ============================================================================== --- trunk/qt/src/YQMainWinDock.h (original) +++ trunk/qt/src/YQMainWinDock.h Wed Jun 4 18:07:27 2008 @@ -136,24 +136,21 @@ virtual void resizeEvent( QResizeEvent * event ); /** + * Resize the visible child to the current size of the dock. + **/ + void resizeVisibleChild(); + + /** * For secondary wizards **/ void setSideBarWidth( int width ); /** * Activate or deactivate the next-lower dialog in the dock when a new - * dialog is opened or when a dialog is closed. + * dialog is opened or when a dialog is closed. **/ void activateCurrentDialog( bool active ); - - -public slots: - - /** - * Resize the visible child to the current size of the dock. - **/ - void resizeVisibleChild(); - + protected slots: Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=48083&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Wed Jun 4 18:07:27 2008 @@ -30,7 +30,6 @@ #include <QSvgRenderer> #include <QPainter> #include <QStackedWidget> -#include <QTimer> #include <qimage.h> #include <qlabel.h> #include <qlayout.h> @@ -75,9 +74,7 @@ #define USE_ICON_ON_HELP_BUTTON 0 - -YQWizard * YQWizard::main_wizard = 0; - +YQWizard *YQWizard::main_wizard = 0; YQWizard::YQWizard( YWidget * parent, const string & backButtonLabel, @@ -145,14 +142,9 @@ if ( !main_wizard && _stepsEnabled ) { main_wizard = this; - } - else if ( main_wizard ) + } else if ( main_wizard ) { - // Calling this in the Qt main loop, not here in the constructor: - // This will indirectly call a lot of virtual methods that are not available yet - // while this object is being constructed. - - QTimer::singleShot( 0, YQMainWinDock::mainWinDock(), SLOT( resizeVisibleChild() ) ); + YQMainWinDock::mainWinDock()->resizeVisibleChild(); } } @@ -167,13 +159,11 @@ delete _helpDlg; } - bool YQWizard::isSecondary() const { return this != main_wizard; } - void YQWizard::layoutTitleBar( QWidget * parent ) { QFrame * titleBar = new QFrame( parent ); -- 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] r48082 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp src/include/repositories_include.ycp src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: lslezak Date: Wed Jun 4 17:42:22 2008 New Revision: 48082 URL: http://svn.opensuse.org/viewcvs/yast?rev=48082&view=rev Log: - fixed editing of an invalid repository URL (bnc#386384), set the selected repository type when going back Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jun 4 17:42:22 2008 @@ -2,6 +2,8 @@ Wed Jun 4 17:26:06 CEST 2008 - lslezak(a)suse.cz - use PackageLock::Connect() - display [Abort] button (bnc#293356) +- fixed editing of an invalid repository URL (bnc#386384), + set the selected repository type when going back ------------------------------------------------------------------- Wed Jun 4 13:19:01 CEST 2008 - lslezak(a)suse.cz Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Jun 4 17:42:22 2008 @@ -814,7 +814,61 @@ // sort the maps by "repos" key (in ascending order) list<map<string,any> > ret = sort(map<string,any> repo1, map<string,any> repo2, repos, {return repo1["priority"]:default_priority < repo2["priority"]:default_priority;}); - y2internal("SortReposByPriority: %1 -> %2", repos, ret); + y2milestone("SortReposByPriority: %1 -> %2", repos, ret); + + return ret; +} + +// remember the original selected URL scheme +string selected_url_scheme = ""; + +symbol StartTypeDialog() +{ + string seturl = selected_url_scheme; + + if (seturl != nil && seturl != "") + { + seturl = selected_url_scheme + "://"; + } + + symbol ret = TypeDialogOpts(true, seturl); + + if (ret == `back) + { + selected_url_scheme = ""; + } + else + { + selected_url_scheme = URL::Parse(SourceDialogs::GetURL())["scheme"]:""; + y2milestone("Selected URL scheme: %1", selected_url_scheme); + + if (selected_url_scheme == nil || selected_url_scheme == "") + { + selected_url_scheme = "url"; + } + } + + return ret; +} + +symbol StartEditDialog() +{ + y2milestone("Edit URL with protocol %1", selected_url_scheme); + symbol ret = SourceDialogs::EditDialogProtocol(selected_url_scheme); + y2milestone("Result: %1", ret); + + return ret; +} + +symbol StartStoreSource() +{ + symbol ret = StoreSource(); + + if (ret == `next || ret == `abort || ret == `close) + { + y2milestone("Resetting selected URL scheme"); + selected_url_scheme = ""; + } return ret; } @@ -872,9 +926,9 @@ map<string,any> aliases = $[ "summary" : ``(SummaryDialog ()), - "type" : ``(TypeDialog()), - "edit" : ``(EditDialog ()), - "store" : ``(StoreSource ()), + "type" : ``(StartTypeDialog()), + "edit" : ``(StartEditDialog ()), + "store" : ``(StartStoreSource ()), "keymgr" : [``(RunGPGKeyMgmt(false)), true] ]; @@ -922,7 +976,7 @@ if (WFM::Args() == [ `sw_single_mode ]) { - y2internal("Started from sw_single, switching the mode"); + y2milestone("Started from sw_single, switching the mode"); full_mode = true; any ret = StartInstSource(); Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Jun 4 17:42:22 2008 @@ -248,6 +248,11 @@ return `ok; } } + else + { + y2error(-1, "Empty URL! Backtrace:"); + return `again; + } } symbol StoreSource () { @@ -306,11 +311,11 @@ return `next; } -symbol TypeDialog() +symbol TypeDialogOpts(boolean download, string url) { - SourceDialogs::SetDownloadOption(true); - // reset the stored URL - SourceDialogs::SetURL(""); + SourceDialogs::SetDownloadOption(download); + SourceDialogs::SetURL(url); + map<string,any> td = SourceDialogs::TypeDialogDownloadOpt(); symbol ret = td["ui"]:`next; @@ -318,6 +323,12 @@ return ret; } +symbol TypeDialog() +{ + // download metadata, reset the stored URL + return TypeDialogOpts(true, ""); +} + symbol EditDialog() { symbol ret = SourceDialogs::EditDialog (); Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Jun 4 17:42:22 2008 @@ -1220,7 +1220,10 @@ else if (type != `ftp) // FTP needs to distinguish absolute and relative path { - directory = Slashed (directory); + // do not add the slash if host and directory is empty + // (avoid e.g. http:// -> http:/// when switching from the parts to the complete view) + if (host != "" || directory != "") + directory = Slashed (directory); } if (UI::WidgetExists (`id (`workgroup))) { @@ -1252,6 +1255,10 @@ _url = (string)UI::QueryWidget(`id(`complete_url), `Value); } +// use selected editing URL part, remember the value in case the URL is wrong +// and the dialog needs to displayed again +boolean editing_parts = true; + /** * Handle function of a widget * @param key string widget key @@ -1377,6 +1384,8 @@ ServerStoreParts(); } + editing_parts = (id == `edit_url_parts); + // reinitialize the dialog (set the current values) ServerInit(nil); } @@ -1387,9 +1396,12 @@ * @param key string widget key */ void ServerInit (string key) { - // check the current edit type - symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); + symbol current_type = editing_parts ? `edit_url_parts : `edit_complete_url; + + // set the stored value + UI::ChangeWidget(`id(`edit_type), `Value, current_type); + y2debug("Current edit type: %1", current_type); UI::ReplaceWidget(`id(`edit_content), (current_type == `edit_url_parts) ? details_content : complete_content); @@ -1522,7 +1534,9 @@ symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); y2debug("Current edit type: %1", current_type); - if (current_type == `edit_url_parts) + editing_parts = (current_type == `edit_url_parts); + + if (editing_parts) { ServerStoreParts(); } @@ -1532,7 +1546,6 @@ } } - /** * Get widget description map * @return widget description map @@ -1543,9 +1556,9 @@ "custom_widget" : `VBox ( `RadioButtonGroup (`id (`edit_type), `HBox ( - `RadioButton(`id(`edit_url_parts), `opt(`notify), _("Edit Parts of the URL"), true), + `RadioButton(`id(`edit_url_parts), `opt(`notify), _("Edit Parts of the URL"), editing_parts), `HSpacing(2), - `RadioButton(`id(`edit_complete_url), `opt(`notify), _("Edit Complete URL")) + `RadioButton(`id(`edit_complete_url), `opt(`notify), _("Edit Complete URL"), !editing_parts) ) ), `VSpacing(0.3), @@ -1782,7 +1795,7 @@ symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, `usb, `hd, - `local_dir, `specify__url, `slp, `local_iso, `comm_repos], selected)) + `local_dir, `specify_url, `slp, `local_iso, `comm_repos], selected)) { if ( selected == `ftp ) _url = "ftp://"; else if ( selected == `http ) _url = "http://"; @@ -2030,8 +2043,8 @@ * Sample implementation of URL selection dialog * @return symbol for wizard sequencer */ -global symbol EditDialog () { - string proto = URLScheme (_url); +global symbol EditDialogProtocol(string proto) +{ y2milestone ("Displaying dialog for protocol %1", proto); string caption = _caption[proto]:""; @@ -2045,6 +2058,15 @@ "fallback_functions" : $[] ]); } +/** + * Sample implementation of URL selection dialog + * @return symbol for wizard sequencer + */ +global symbol EditDialog () { + string proto = URLScheme (_url); + + return EditDialogProtocol(proto); +} /** * URL editation popup with the HTTPS option -- 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] r48081 - /trunk/qt-pkg/src/YQPkgRepoList.cc
by kmachalkova＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: kmachalkova Date: Wed Jun 4 17:42:08 2008 New Revision: 48081 URL: http://svn.opensuse.org/viewcvs/yast?rev=48081&view=rev Log: Use PoolQuery API for filtering pkgs by repositories Modified: trunk/qt-pkg/src/YQPkgRepoList.cc Modified: trunk/qt-pkg/src/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRepoList.cc?rev=… ============================================================================== --- trunk/qt-pkg/src/YQPkgRepoList.cc (original) +++ trunk/qt-pkg/src/YQPkgRepoList.cc Wed Jun 4 17:42:08 2008 @@ -24,6 +24,7 @@ #define YUILogComponent "qt-pkg" #include "YUILog.h" #include <zypp/RepoManager.h> +#include <zypp/PoolQuery.h> #include <QTreeWidget> #include "YQPkgRepoList.h" @@ -121,11 +122,6 @@ // Collect all packages on this repository // - set<ZyppSel> exactMatches; - set<ZyppSel> nearMatches; - - - QTreeWidgetItem * item; QList<QTreeWidgetItem *> items = selectedItems(); @@ -140,65 +136,16 @@ { ZyppRepo currentRepo = repoItem->zyppRepo(); - for ( ZyppPoolIterator sel_it = zyppPkgBegin(); - sel_it != zyppPkgEnd(); - ++sel_it ) - { - if ( (*sel_it)->installedObj() && - ( currentRepo.isSystemRepo() ) ) - { - exactMatches.insert( *sel_it ); - } - - if ( (*sel_it)->candidateObj() && - (*sel_it)->candidateObj()->repository() == currentRepo ) - { - exactMatches.insert( *sel_it ); - } - else - { - zypp::ui::Selectable::available_iterator pkg_it = (*sel_it)->availableBegin(); - - while ( pkg_it != (*sel_it)->availableEnd() ) - { - if ( (*pkg_it)->repository() == currentRepo ) - nearMatches.insert( *sel_it ); - - ++pkg_it; - } - } - } - - } - } - - - // - // Send all exact matches to the list - // (emit a filterMatch signal for each one) - // - - set<ZyppSel>::const_iterator sel_it = exactMatches.begin(); - - while ( sel_it != exactMatches.end() ) - { - emit filterMatch( (*sel_it), tryCastToZyppPkg( (*sel_it)->theObj() ) ); - nearMatches.erase( *sel_it ); - ++sel_it; - } - - - // - // Send all near matches to the list - // (emit a filterNearMatch signal for each one) - // - - sel_it = nearMatches.begin(); - - while ( sel_it != nearMatches.end() ) - { - emit filterNearMatch( *sel_it, tryCastToZyppPkg( (*sel_it)->theObj() ) ); - ++sel_it; + zypp::PoolQuery query; + query.addRepo( currentRepo.info().alias() ); + query.addKind(zypp::ResKind::package); + + for( zypp::PoolQuery::Selectable_iterator it = query.selectableBegin(); + it != query.selectableEnd(); it++) + { + emit filterMatch( *it, tryCastToZyppPkg( (*it)->theObj() ) ); + } + } } yuiDebug() << "Packages sent to package list. Elapsed time: " -- 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] r48080 - in /trunk/packager: package/yast2-packager.changes src/clients/key_manager.ycp src/clients/repositories.ycp src/clients/sw_single.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: lslezak Date: Wed Jun 4 17:28:22 2008 New Revision: 48080 URL: http://svn.opensuse.org/viewcvs/yast?rev=48080&view=rev Log: - use PackageLock::Connect() - display [Abort] button (bnc#293356) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/key_manager.ycp trunk/packager/src/clients/repositories.ycp trunk/packager/src/clients/sw_single.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jun 4 17:28:22 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 4 17:26:06 CEST 2008 - lslezak(a)suse.cz + +- use PackageLock::Connect() - display [Abort] button (bnc#293356) + +------------------------------------------------------------------- Wed Jun 4 13:19:01 CEST 2008 - lslezak(a)suse.cz - removed the workaround for locking 64-bit packages on PPC32 Modified: trunk/packager/src/clients/key_manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/key_manager… ============================================================================== --- trunk/packager/src/clients/key_manager.ycp (original) +++ trunk/packager/src/clients/key_manager.ycp Wed Jun 4 17:28:22 2008 @@ -26,14 +26,10 @@ symbol Read() { - // TODO: the check dialog contains only [Continue] [Retry] buttons - // there is no [Abort] (#293356) - if (!PackageLock::Check()) + if (!PackageLock::Connect(false)["connected"]:false) { - // error message - SW management is already in use, access denied + // SW management is already in use, access denied // the yast module cannot be started - Report::Error(_("The GPG key management module cannot work -without access to the software management system.")); Wizard::CloseDialog (); return `abort; } Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Jun 4 17:28:22 2008 @@ -835,7 +835,7 @@ } // check whether running as root - if (! Confirm::MustBeRoot () || ! PackageLock::Check ()) + if (! Confirm::MustBeRoot () || !PackageLock::Connect(false)["connected"]:false) { UI::CloseDialog (); return `abort; Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.y… ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Jun 4 17:28:22 2008 @@ -317,14 +317,10 @@ return `abort; } - // TODO: the check dialog contains only [Continue] [Retry] buttons - // there is no [Abort] (#293356) - if (!PackageLock::Check()) + if (!PackageLock::Connect(false)["connected"]:false) { - // error message - SW management is already in use, access denied + // SW management is already in use, access denied // the yast module cannot be started - Report::Error(_("The software management module cannot work -without access to the software management system.")); UI::CloseDialog (); return `abort; } Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Jun 4 17:28:22 2008 @@ -4,8 +4,8 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp -# empty package callbacks -BuildRequires: yast2 >= 2.16.52 +# PackageLock::Connect() +BuildRequires: yast2 >= 2.16.72 # "order" flag for pattern resolvables BuildRequires: yast2-pkg-bindings >= 2.16.31 @@ -20,8 +20,8 @@ # "order" flag for pattern resolvables Requires: yast2-pkg-bindings >= 2.16.31 -# empty package callbacks -Requires: yast2 >= 2.16.52 +# PackageLock::Connect() +Requires: yast2 >= 2.16.72 # unzipping license file Requires: unzip -- 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] r48079 - in /trunk/yast2: library/packages/src/PackageLock.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: lslezak Date: Wed Jun 4 17:25:51 2008 New Revision: 48079 URL: http://svn.opensuse.org/viewcvs/yast?rev=48079&view=rev Log: - added PackageLock::Connect() - similar to PackageLock::Check() but [Abort] is always displayed and [Continue] is optional (bnc#293356) Modified: trunk/yast2/library/packages/src/PackageLock.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageLock.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageLock.ycp (original) +++ trunk/yast2/library/packages/src/PackageLock.ycp Wed Jun 4 17:25:51 2008 @@ -18,6 +18,7 @@ import "Label"; boolean have_lock = nil; +boolean aborted = false; /** * Tries to acquire the packager (zypp) lock. @@ -63,5 +64,88 @@ return have_lock; } +/** + * Tries to acquire the packager (zypp) lock. + * Reports an error if another process has the lock already. + * Will only report once even if called multiple times. + * @return true if we can continue + */ +global map<string,any> Connect(boolean show_continue_button) +{ + // we already have a lock + if (have_lock != nil) return $[ "connected" : have_lock, "aborted" : aborted ]; + + boolean try_again = true; + + // while not having a lock and user wants to try again + while (try_again) { + // Invoke a cheap call that accesses the zypp lock + have_lock = Pkg::Connect () == true; // nil guard + if (have_lock == true) break; + + if (have_lock != true) { + if (show_continue_button) + { + symbol ret = Popup::AnyQuestion3( + // TRANSLATORS: a popup headline + _("Accessing the Package Management Failed"), + // TRANSLATORS: an error message with question + _("Another process is accessing the package database. +Package management cannot be used now. +") + + "\n" + + _("Would you like to retry to access it, +continue without having access to the package management +or abort? +"), + Label::RetryButton(), + Label::ContinueButton(), + Label::AbortButton(), + // default is 'Retry' + `focus_yes + ); + + try_again = (ret == `yes); + + // NOTE: due to the changed labels this actually means that [Abort] was pressed!! + if (ret == `retry) + { + aborted = true; + } + } + else + { + boolean ret = Popup::AnyQuestion( + // TRANSLATORS: a popup headline + _("Accessing the Package Management Failed"), + // TRANSLATORS: an error message with question + _("Another process is accessing the package database. +Package management cannot be used now. +") + + "\n" + +_("Would you like to abort or retry to access it? +"), + Label::RetryButton(), + Label::AbortButton(), + // default is 'Retry' + `focus_yes + ); + + try_again = ret; + aborted = !ret; + } + + y2milestone("try_again: %1, aborted: %2", try_again, aborted); + + } + + if (try_again) y2milestone ("User decided to retry..."); + } + + map<string,any> ret = $[ "connected" : have_lock, "aborted" : aborted ]; + y2milestone ("PackageLock::Connect result: %1", ret); + + return ret; +} } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Jun 4 17:25:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 4 16:32:13 CEST 2008 - lslezak(a)suse.cz + +- added PackageLock::Connect() - similar to PackageLock::Check() + but [Abort] is always displayed and [Continue] is optional + (bnc#293356) + +------------------------------------------------------------------- Tue Jun 3 16:49:06 CEST 2008 - locilka(a)suse.cz - Always calling NetworkInterfaces::Read in SuSEFirewall::Read -- 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] r48078 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 16:38:08 2008 New Revision: 48078 URL: http://svn.opensuse.org/viewcvs/yast?rev=48078&view=rev Log: new pkg for abuild Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=48078&r1=48… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Jun 4 16:38:08 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "53") +SET(VERSION_PATCH "54") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Jun 4 16:38:08 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 4 16:36:08 CEST 2008 - sh(a)suse.de + +- Prevent segfault for secondary wizards: + Call YQMainWinDock::resizeVisibleChild() indirectly via + single shot timer to avoid calling virtual methods in constructor + +------------------------------------------------------------------- Tue Jun 3 13:42:19 CEST 2008 - tgoettlicher(a)suse.de - limited bar width in disk usage list to 100% -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0