July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58215 - in /trunk/control-center/src: kcategorizedsortfilterproxymodel.cpp kcategorizedsortfilterproxymodel.h kcategorizedsortfilterproxymodel_p.h yqmodulesmodel.cpp yqmodulesmodel.h
by kmachalkova＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: kmachalkova Date: Thu Jul 30 14:32:55 2009 New Revision: 58215 URL: http://svn.opensuse.org/viewcvs/yast?rev=58215&view=rev Log: Support search in keywords (X-SuSE-YaST-Keywords -> comma-separated list of those) (FaTE #305845) Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp trunk/control-center/src/kcategorizedsortfilterproxymodel.h trunk/control-center/src/kcategorizedsortfilterproxymodel_p.h trunk/control-center/src/yqmodulesmodel.cpp trunk/control-center/src/yqmodulesmodel.h Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp Thu Jul 30 14:32:55 2009 @@ -300,22 +300,28 @@ bool KCategorizedSortFilterProxyModel::filterAcceptsRow( int row, const QModelIndex &srcindex ) const { - bool ret = QSortFilterProxyModel::filterAcceptsRow( row, srcindex ); QModelIndex i0 = sourceModel()->index( row, YQDesktopFilesModel::Group, srcindex); + QModelIndex i1 = sourceModel()->index( row, 0, srcindex); + QStringList keywordList = sourceModel()->data( i1, KeywordsRole ).toStringList(); + QString keywords = keywordList.join(" "); - if( ret ) + bool nameMatches = QSortFilterProxyModel::filterAcceptsRow( row, srcindex ); + bool keywordMatches = ( !keywords.isEmpty() && keywords.contains( filterFixedString()) ); + + if( nameMatches || keywordMatches ) { QString gr = sourceModel()->data(i0, Qt::UserRole).toString(); d->filterGroups.insert( gr ); } - return ret; + + return ( nameMatches || keywordMatches ); } void KCategorizedSortFilterProxyModel::bublisFilterFunction( const QString &s ) { d->filterGroups.clear(); setFilterFixedString( s ); - + d->filterString = s; } QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp() @@ -328,3 +334,8 @@ // dumb constant, make sure nothing matches if the list of matching groups is empty return QString("zzzz"); } + +QString KCategorizedSortFilterProxyModel::filterFixedString() const +{ + return d->filterString; +} Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.h Thu Jul 30 14:32:55 2009 @@ -60,6 +60,8 @@ ///< value won't be shown on the view, is only for sorting purposes. What will ///< be shown as "Category" on the view will be asked with the role ///< CategoryDisplayRole. + + KeywordsRole = 0x09B2C2AA }; KCategorizedSortFilterProxyModel(QObject *parent = 0); @@ -118,6 +120,8 @@ QString matchingGroupFilterRegexp(); + QString filterFixedString() const; + protected: /** * Overridden from QSortFilterProxyModel. If you are subclassing @@ -184,6 +188,7 @@ private: class Private; Private *const d; + }; Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel_p.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel_p.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel_p.h Thu Jul 30 14:32:55 2009 @@ -47,6 +47,7 @@ bool sortCategoriesByNaturalComparison; QSet<QString> filterGroups; + QString filterString; }; #endif Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmode… ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Thu Jul 30 14:32:55 2009 @@ -159,11 +159,15 @@ } else if ( role == GenericNameRole ) { - //QString tooltip = d->infoProvider.provideInfo( this, index ); QString tooltip = translatedPropertyValue(index, "GenericName").toString(); return tooltip; } + else if ( role == KCategorizedSortFilterProxyModel::KeywordsRole ) + { + //FIXME: use translatedPropertyValue + return propertyValue( index, "X-SuSE-YaST-Keywords" ); + } else if ( role == Qt::DecorationRole ) { QVariant icon = YQDesktopFilesModel::data( index, role ); Modified: trunk/control-center/src/yqmodulesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmode… ============================================================================== --- trunk/control-center/src/yqmodulesmodel.h (original) +++ trunk/control-center/src/yqmodulesmodel.h Thu Jul 30 14:32:55 2009 @@ -30,7 +30,7 @@ enum UserRoleData { - GenericNameRole = 0x1BA81D0E + GenericNameRole = 0x1BA81D0E }; YQModulesModel( QObject * parent = 0 ); -- 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] r58214 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgSearchFilterView.cc
by tgoettlicher＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: tgoettlicher Date: Thu Jul 30 11:25:12 2009 New Revision: 58214 URL: http://svn.opensuse.org/viewcvs/yast?rev=58214&view=rev Log: Fixed bnc #499699: position of search button in software management module Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jul 30 11:25:12 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 30 11:24:17 CEST 2009 - tgoettlicher(a)suse.de + +- Fixed bnc #499699: position of search button in software management module + +------------------------------------------------------------------- Thu Jul 30 10:56:42 CEST 2009 - tgoettlicher(a)suse.de - Fixed buggy search in keywords (bnc #470069) Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Thu Jul 30 11:25:12 2009 @@ -53,27 +53,19 @@ YUI_CHECK_NEW( layout ); setLayout( layout ); _matchCount = 0; - layout->addStretch(); - // Headline - QLabel * label = new QLabel( _( "Searc&h:" ), this ); - YUI_CHECK_NEW( label ); - layout->addWidget(label); - label->setFont( YQUI::yqApp()->headingFont() ); + // Box for search button + QHBoxLayout * hbox = new QHBoxLayout(); + YUI_CHECK_NEW( hbox ); + layout->addLayout(hbox); // Input field ( combo box ) for search text _searchText = new QComboBox( this ); YUI_CHECK_NEW( _searchText ); - layout->addWidget(_searchText); - _searchText->setEditable( true ); - label->setBuddy( _searchText ); + _searchText->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); - - // Box for search button - QHBoxLayout * hbox = new QHBoxLayout(); - YUI_CHECK_NEW( hbox ); - layout->addLayout(hbox); - hbox->addStretch(); + hbox->addWidget(_searchText); + _searchText->setEditable( true ); // Search button _searchButton = new QPushButton( _( "&Search" ), this ); @@ -127,7 +119,7 @@ // Search mode // - label = new QLabel( _( "Search &Mode:" ), this ); + QLabel * label = new QLabel( _( "Search &Mode:" ), this ); YUI_CHECK_NEW( label ); layout->addWidget( label ); -- 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] r58213 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgSearchFilterView.cc src/YQPkgSearchFilterView.h
by tgoettlicher＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: tgoettlicher Date: Thu Jul 30 10:57:57 2009 New Revision: 58213 URL: http://svn.opensuse.org/viewcvs/yast?rev=58213&view=rev Log: Fixed buggy search in keywords (bnc #470069) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgSearchFilterView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.h Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jul 30 10:57:57 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 30 10:56:42 CEST 2009 - tgoettlicher(a)suse.de + +- Fixed buggy search in keywords (bnc #470069) + +------------------------------------------------------------------- Tue Jul 28 15:07:17 CEST 2009 - tgoettlicher(a)suse.de - Fixed closing tab mixes up view (bnc #513845) Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Thu Jul 30 10:57:57 2009 @@ -97,6 +97,8 @@ _searchInName = new QCheckBox( _( "&Name" ), gbox ); YUI_CHECK_NEW( _searchInName ); vLayout->addWidget(_searchInName); + _searchInKeywords = new QCheckBox( _( "&Keywords" ), gbox ); YUI_CHECK_NEW( _searchInKeywords ); + vLayout->addWidget(_searchInKeywords); _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); YUI_CHECK_NEW( _searchInSummary ); vLayout->addWidget(_searchInSummary); _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); YUI_CHECK_NEW( _searchInDescription ); @@ -115,6 +117,7 @@ _searchInName->setChecked( true ); + _searchInKeywords->setChecked( true ); _searchInSummary->setChecked( true ); layout->addStretch(); @@ -271,10 +274,7 @@ if ( _searchInRequires->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); if ( _searchInProvides->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); if ( _searchInFileList->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::filelist ); - - // always look in keywords so FATE #120368 is implemented - // but make this configurable later - query.addAttribute( zypp::sat::SolvAttr::keywords ); + if ( _searchInKeywords->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::keywords ); _searchText->setEnabled(false); _searchButton->setEnabled(false); Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.h Thu Jul 30 10:57:57 2009 @@ -160,6 +160,7 @@ QPushButton * _searchButton; QCheckBox * _searchInName; + QCheckBox * _searchInKeywords; QCheckBox * _searchInSummary; QCheckBox * _searchInDescription; QCheckBox * _searchInRequires; -- 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] r58212 - /trunk/qt-pkg/src/YQPkgFilterTab.cc
by tgoettlicher＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: tgoettlicher Date: Thu Jul 30 10:48:56 2009 New Revision: 58212 URL: http://svn.opensuse.org/viewcvs/yast?rev=58212&view=rev Log: cleanup Modified: trunk/qt-pkg/src/YQPkgFilterTab.cc Modified: trunk/qt-pkg/src/YQPkgFilterTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgFilterTab.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgFilterTab.cc (original) +++ trunk/qt-pkg/src/YQPkgFilterTab.cc Thu Jul 30 10:48:56 2009 @@ -634,7 +634,6 @@ if ( priv->tabContextMenuPage ) { int pageIndex = priv->tabContextMenuPage->tabIndex; - int oldCurrentIndex = tabBar()->currentIndex(); tabBar()->removeTab( pageIndex ); -- 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] r58211 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: rhafer Date: Thu Jul 30 09:44:43 2009 New Revision: 58211 URL: http://svn.opensuse.org/viewcvs/yast?rev=58211&view=rev Log: Added some sanity checks to make AutoYaST support more tolerant (bnc#522216) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 30 09:44:43 2009 @@ -535,6 +535,10 @@ my $ret = 1; if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig ) { + if ( ! $self->ReadServiceEnabled() ) + { + return 1; + } $overwriteConfig = 0; my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), @@ -595,6 +599,15 @@ y2milestone("using tempfile: ".$tmpfile ); my $ldif = SCR->Read('.ldapserver.configAsLdif' ); y2debug($ldif); + if ( ! $ldif ) + { + my $err = SCR->Error(".ldapserver"); + y2error("Creating LDIF for initial configuration failed"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + # cleanup + SCR->Execute('.target.bash', "rm -f $tmpfile" ); + return 0; + } $rc = SCR->Write('.target.string', $tmpfile, $ldif ); if ( $rc ) { @@ -856,21 +869,41 @@ my $hash = shift; y2milestone("LdapServer::Import() : ". Data::Dumper->Dump([$hash])); - if ( ! keys( %$hash ) ) + if ( (! keys( %$hash )) || (! defined $hash->{'daemon'}) || + (! defined $hash->{'globals'}) || (! defined $hash->{'databases'}) ) { $usingDefaults = 1; $overwriteConfig = 0; $self->WriteServiceEnabled( 0 ); + y2milestone("Wrong/empty ldap-server profile"); + return 0; + } + + if ( defined $hash->{'daemon'}->{'serviceEnabled'} ) + { + $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); + } + else + { + $self->WriteServiceEnabled(0); + } + + if ( ! $self->ReadServiceEnabled() ) + { return 1; } + $usingDefaults = 0; $overwriteConfig = 1; - $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); - if ( ! $self->ReadServiceEnabled() ) + + if ( defined $hash->{'daemon'}->{'slp'} ) { - return 1; + $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); + } + else + { + $self->WriteSLPEnabled( 0 ); } - $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); foreach my $listner (@{$hash->{'daemon'}->{'listners'} } ) { @@ -1108,7 +1141,7 @@ sub AutoPackages { # TODO FIXME: your code here... my %ret = ( - "install" => (), + "install" => ( "openldap2", "openldap2-client" ), "remove" => (), ); return \%ret; Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Thu Jul 30 09:44:43 2009 @@ -1583,6 +1583,10 @@ { y2milestone("ConfigToLdif"); std::ostringstream ldif; + if ( ! globals || ! schemaBase ) + { + throw std::runtime_error("Configuration not initialized. Can't create LDIF dump." ); + } ldif << globals->toLdif() << std::endl; ldif << schemaBase->toLdif() << std::endl; OlcSchemaList::const_iterator j; -- 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] r58210 - /trunk/yast2/library/packages/src/PackageLock.ycp
by jsuchome＠svn.opensuse.org 30 Jul '09

30 Jul '09

Author: jsuchome Date: Thu Jul 30 09:36:45 2009 New Revision: 58210 URL: http://svn.opensuse.org/viewcvs/yast?rev=58210&view=rev Log: function comment Modified: trunk/yast2/library/packages/src/PackageLock.ycp 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 Thu Jul 30 09:36:45 2009 @@ -66,7 +66,8 @@ * 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 + * @param show_continue_button show option to continue without access + * @return map with lock status and user reaction */ global map<string,any> Connect(boolean show_continue_button) { -- 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] r58209 - in /trunk/control-center/src: kcategorizedsortfilterproxymodel.h moduleiconitem.cpp moduleiconitem.h yqmodulesmodel.cpp yqmodulesmodel.h
by kmachalkova＠svn.opensuse.org 29 Jul '09

29 Jul '09

Author: kmachalkova Date: Wed Jul 29 16:37:42 2009 New Revision: 58209 URL: http://svn.opensuse.org/viewcvs/yast?rev=58209&view=rev Log: Moving this role to more appropriate place Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h trunk/control-center/src/moduleiconitem.cpp trunk/control-center/src/moduleiconitem.h trunk/control-center/src/yqmodulesmodel.cpp trunk/control-center/src/yqmodulesmodel.h Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.h Wed Jul 29 16:37:42 2009 @@ -60,7 +60,6 @@ ///< value won't be shown on the view, is only for sorting purposes. What will ///< be shown as "Category" on the view will be asked with the role ///< CategoryDisplayRole. - GenericNameRole = 0x1BA81D0E }; KCategorizedSortFilterProxyModel(QObject *parent = 0); Modified: trunk/control-center/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconite… ============================================================================== --- trunk/control-center/src/moduleiconitem.cpp (original) +++ trunk/control-center/src/moduleiconitem.cpp Wed Jul 29 16:37:42 2009 @@ -79,7 +79,7 @@ painter->setPen( inv ); } - QString descr = option.fontMetrics.elidedText( index.data( KCategorizedSortFilterProxyModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() ); + QString descr = option.fontMetrics.elidedText( index.data( YQModulesModel::GenericNameRole ).toString(), Qt::ElideRight, option.rect.width() ); QRect tr = option.rect; tr.setTop( tr.top() + decorationSize.height() + 2*style->pixelMetric( QStyle::PM_FocusFrameVMargin) ); painter->drawText( tr, Qt::AlignLeft | Qt::TextSingleLine, descr ); Modified: trunk/control-center/src/moduleiconitem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconite… ============================================================================== --- trunk/control-center/src/moduleiconitem.h (original) +++ trunk/control-center/src/moduleiconitem.h Wed Jul 29 16:37:42 2009 @@ -28,7 +28,7 @@ #include <QPainterPath> #include <QRectF> -#include "kcategorizedsortfilterproxymodel.h" +#include "yqmodulesmodel.h" class KCModuleInfo; Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmode… ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Wed Jul 29 16:37:42 2009 @@ -157,7 +157,7 @@ return groupsModel()->data( idx, Qt::UserRole); } - else if ( role == KCategorizedSortFilterProxyModel::GenericNameRole ) + else if ( role == GenericNameRole ) { //QString tooltip = d->infoProvider.provideInfo( this, index ); Modified: trunk/control-center/src/yqmodulesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmode… ============================================================================== --- trunk/control-center/src/yqmodulesmodel.h (original) +++ trunk/control-center/src/yqmodulesmodel.h Wed Jul 29 16:37:42 2009 @@ -30,10 +30,7 @@ enum UserRoleData { - RawName, - SortKey, - Hidden, - LastColumn + GenericNameRole = 0x1BA81D0E }; YQModulesModel( QObject * parent = 0 ); -- 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] r58208 - /tags/branch-SLE-10-SP3-2_13_163/bootloader/
by juhliarik＠svn.opensuse.org 29 Jul '09

29 Jul '09

Author: juhliarik Date: Wed Jul 29 15:17:52 2009 New Revision: 58208 URL: http://svn.opensuse.org/viewcvs/yast?rev=58208&view=rev Log: Created tag branch-SLE-10-SP3-2_13_163 for bootloader Added: tags/branch-SLE-10-SP3-2_13_163/bootloader/ - copied from r58207, branches/SuSE-SLE-10-SP3-Branch/bootloader/ -- 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] r58207 - /tags/branch-SLE-10-SP3-2_13_163/
by juhliarik＠svn.opensuse.org 29 Jul '09

29 Jul '09

Author: juhliarik Date: Wed Jul 29 15:17:50 2009 New Revision: 58207 URL: http://svn.opensuse.org/viewcvs/yast?rev=58207&view=rev Log: Created tag branch-SLE-10-SP3-2_13_163 Added: tags/branch-SLE-10-SP3-2_13_163/ -- 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] r58206 - in /branches/SuSE-SLE-10-SP3-Branch/bootloader: VERSION package/yast2-bootloader.changes src/grub/misc.ycp
by juhliarik＠svn.opensuse.org 29 Jul '09

29 Jul '09

Author: juhliarik Date: Wed Jul 29 15:17:43 2009 New Revision: 58206 URL: http://svn.opensuse.org/viewcvs/yast?rev=58206&view=rev Log: updated proposal for using GPT Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Wed Jul 29 15:17:43 2009 @@ -1 +1 @@ -2.13.162 +2.13.163 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Wed Jul 29 15:17:43 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 29 13:53:16 CEST 2009 - juhliarik(a)suse.cz + +- added fix for proposal if GPT is used (bnc#525968) +- 2.13.163 + +------------------------------------------------------------------- Tue Jul 16 12:52:56 CEST 2009 - juhliarik(a)suse.cz - update checking of MBR and bootloader proposal (bnc#517293) Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Wed Jul 29 15:17:43 2009 @@ -549,6 +549,8 @@ // variable is not used for grub anymore symbol selected_location = `mbr; // default to mbr boolean windows_mbr = false; + // bnc#525968 - Booting from GPT Failed + boolean gpt_used = false; // check whether the /boot partition // - is primary: is_logical -> false // - is on the first disk (with the MBR): boot_partition_is_on_mbr_disk -> true @@ -559,6 +561,16 @@ boolean boot_partition_is_on_mbr_disk = (boot_partition_disk == BootCommon::mbrDisk); + // bnc#525968 - Booting from GPT Failed + string dp_dev = dp["disk"]:""; + if (tm[dp_dev,"label"]:"" == "gpt") + { + y2milestone("gpt used on disk: %1", dp_dev); + gpt_used = true; + } else { + y2milestone("gpt not used on disk: %1", dp_dev); + } + map dm = tm[boot_partition_disk]:$[]; list<map> partitions_on_boot_partition_disk = dm["partitions"]:[]; boolean is_logical = false; @@ -697,7 +709,13 @@ BootCommon::globals["activate"] = "true"; SetBootloaderDevice(selected_location); } - + // bnc#525968 - Booting from GPT Failed + if (gpt_used) + { + y2milestone("Install GRUB to MBR because GPT is used"); + selected_location = `mbr; + SetBootloaderDevice(selected_location); + } return selected_location; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0