April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46833 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 14:37:48 2008 New Revision: 46833 URL: http://svn.opensuse.org/viewcvs/yast?rev=46833&view=rev Log: - 2.16.29 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=46833&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Apr 18 14:37:48 2008 @@ -1 +1 @@ -2.16.28 +2.16.29 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Apr 18 14:37:48 2008 @@ -6,6 +6,7 @@ - added Pkg::TargetRebuildInit(string root) function which rebuilds the RPM DB ('rpm --rebuilddb') before initializing the target (bnc#308352) +- 2.16.29 ------------------------------------------------------------------- Thu Apr 17 13:04:03 CEST 2008 - schubi(a)suse.de -- 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] r46832 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-main.ycp modules/TabPanel.ycp modules/TreePanel.ycp
by aschnell＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: aschnell Date: Fri Apr 18 14:35:53 2008 New Revision: 46832 URL: http://svn.opensuse.org/viewcvs/yast?rev=46832&view=rev Log: - stricter types Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Fri Apr 18 14:35:53 2008 @@ -40,7 +40,8 @@ include "partitioning/ep-log.ycp"; - map data = $[]; + map<any, map> data = $[]; + list<term> MakeNavigationTree(map open_items) { Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp Fri Apr 18 14:35:53 2008 @@ -4,8 +4,9 @@ * Summary: Expert Partitioner * Authors: Arvin Schnell <aschnell(a)suse.de> * - * The DumbTab widget must have id `tab. The ids of the items of the DumbTab widget - * must be made of symbols. + * The DumbTab widget must have id `tab. The ids of the items of the DumbTab + * widget must be made of symbols. The id must be the first argument of the + * items. */ { module "TabPanel"; @@ -55,6 +56,18 @@ } + void Check() + { + list<symbol> items1 = maplist(symbol s, map m, data, { return s; }); + + list<symbol> items2 = maplist(term t, (list<term>) UI::QueryWidget(`id(`tab), `Items), + { return t[0, 0]:`none; }); + + if (sort(items1) != sort(items2)) + y2warning("DumbTab items and callback data do not match"); + } + + void AddToHistory() { history = filter(symbol s, history, { return s != current_item; }); @@ -68,14 +81,10 @@ global void Init(map<symbol, map> d) { data = d; + Check(); - list<symbol> item1 = maplist(term t, (list<term>) UI::QueryWidget(`id(`tab), `Items), - { return t[0, 0]:`none; }); - list<symbol> item2 = maplist(symbol s, map m, data, { return s; }); - if (sort(item1) != sort(item2)) - y2warning("DumbTab items and callback data do not match"); - - current_item = find(symbol s, history, { return contains(item1, s); }); + list<symbol> items = maplist(symbol s, map m, data, { return s; }); + current_item = find(symbol s, history, { return contains(items, s); }); if (current_item != nil) { Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Fri Apr 18 14:35:53 2008 @@ -4,13 +4,15 @@ * Summary: Expert Partitioner * Authors: Arvin Schnell <aschnell(a)suse.de> * - * The Tree widget must have id `tree. + * The Tree widget must have id `tree. The ids of the items of the Tree + * widget must be made of symbols or strings. The id must be the first + * argument of the items. */ { module "TreePanel"; - map data = nil; + map<any, map> data = nil; any current_item = nil; @@ -52,15 +54,24 @@ } + void Check() + { + list<any> items1 = maplist(any a, map m, data, { return a; }); + + // TODO: likely not worth it, rather clumsy + } + + /** * Initialises internal data and calls the create function of the * selected panel. * * When calling this function the Tree widget must already exist. */ - global void Init(map d) + global void Init(map<any, map> d) { data = d; + Check(); current_item = UI::QueryWidget(`tree, `CurrentItem); CallCreate(); @@ -69,7 +80,7 @@ /** * Update the contents of the Tree widget. */ - global void Update(map d, list tree, any new_item) + global void Update(map<any, map> d, list tree, any new_item) { any old_item = current_item; @@ -86,12 +97,14 @@ { CallDestroy(); data = d; + Check(); current_item = new_item; CallCreate(); } else { data = d; + Check(); } } -- 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] r46831 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Package.cc src/PkgFunctions.h
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 13:34:57 2008 New Revision: 46831 URL: http://svn.opensuse.org/viewcvs/yast?rev=46831&view=rev Log: - added Pkg::PkgMediaPackageSizes() to speed up computing the download size of the selected packages Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgFunctions.h Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Apr 18 13:34:57 2008 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- -Fri Apr 18 11:52:11 CEST 2008 - lslezak(a)suse.cz +Fri Apr 18 13:27:33 CEST 2008 - lslezak(a)suse.cz +- added Pkg::PkgMediaPackageSizes() to speed up computing + the download size of the selected packages - added Pkg::TargetRebuildInit(string root) function which rebuilds the RPM DB ('rpm --rebuilddb') before initializing the target (bnc#308352) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Apr 18 13:34:57 2008 @@ -253,23 +253,9 @@ -// ------------------------ -/** - * @builtin PkgMediaSizes - * @short Return size of packages to be installed - * @description - * return cumulated sizes (in bytes !) to be installed from different sources and media - * - * Returns the install size, not the archivesize !! - * - * @return list<list<integer>> - * @usage Pkg::PkgMediaSizes () -> [ [src1_media_1_size, src1_media_2_size, ...], ..] - */ YCPValue -PkgFunctions::PkgMediaSizesOrCount (bool sizes) +PkgFunctions::PkgMediaSizesOrCount (bool sizes, bool download_size) { -# warning No installation order - // all enabled sources std::list<RepoId> source_ids; @@ -322,7 +308,7 @@ if (medium > 0) { - zypp::ByteCount size = sizes ? pkg->size() : zypp::ByteCount(1); //count only + zypp::ByteCount size = sizes ? (download_size ? pkg->downloadSize() : pkg->size()) : zypp::ByteCount(1); //count only // refence to the found media array std::vector<zypp::ByteCount> &ref = result[source_map[pkg->repoInfo().alias()]]; @@ -355,7 +341,7 @@ res->add( source ); } - y2milestone( "Pkg::%s result: %s", sizes?"PkgMediaSizes": "PkgMediaCount", res->toString().c_str()); + y2milestone( "Pkg::%s result: %s", sizes ? (download_size ? "PkgMediaPackageSizes" : "PkgMediaSizes" ): "PkgMediaCount", res->toString().c_str()); return res; } @@ -380,6 +366,24 @@ // ------------------------ /** + * @builtin PkgMediaPackageSizes + * @short Return size of packages to be installed + * @description + * return cumulated sizes (in bytes !) to be installed from different sources and media + * + * Returns the archive sizes! + * + * @return list<list<integer>> + * @usage Pkg::PkgMediaPackageSizes () -> [ [src1_media_1_size, src1_media_2_size, ...], ..] + */ +YCPValue +PkgFunctions::PkgMediaPackageSizes() +{ + return PkgMediaSizesOrCount (true, true); +} + +// ------------------------ +/** * @builtin PkgMediaCount * @short Return number of packages to be installed * @description Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Fri Apr 18 13:34:57 2008 @@ -118,7 +118,7 @@ YCPValue GetPkgLocation(const YCPString& p, bool full_path); YCPValue PkgProp( zypp::PoolItem item ); - YCPValue PkgMediaSizesOrCount (bool sizes); + YCPValue PkgMediaSizesOrCount (bool sizes, bool download_size = false); YCPValue TargetInitInternal(const YCPString& root, bool rebuild_rpmdb); bool aliasExists(const std::string &alias) const; @@ -658,6 +658,8 @@ /* TYPEINFO: list<list<integer>>()*/ YCPValue PkgMediaSizes (); /* TYPEINFO: list<list<integer>>()*/ + YCPValue PkgMediaPackageSizes(); + /* TYPEINFO: list<list<integer>>()*/ YCPValue PkgMediaCount(); /* TYPEINFO: list<list<any>>()*/ YCPValue PkgMediaNames (); -- 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] r46830 - in /trunk/ncurses-pkg/src: NCPkgFilterContainer.cc NCPkgFilterContainer.h
by kmachalkova＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: kmachalkova Date: Fri Apr 18 12:44:46 2008 New Revision: 46830 URL: http://svn.opensuse.org/viewcvs/yast?rev=46830&view=rev Log: Removing no longer needed code (thanks, zypp guys) Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc trunk/ncurses-pkg/src/NCPkgFilterContainer.h Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterConta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Fri Apr 18 12:44:46 2008 @@ -122,67 +122,6 @@ } -bool NCPkgFilterContainer::showContainerContent( const set<string> & wanted ) -{ - NCPkgTable * packageList = packager->PackageList(); - - if ( !packageList ) - { - yuiError() << "Widget is not a valid NCPkgTable widget" << endl; - return false; - } - - // clear the package table - packageList->itemsCleared (); - - set<string>::iterator not_found = wanted.end (); - - std::vector<ZyppSel> sorted; - sorted.reserve (wanted.size ()); - - yuiMilestone() << "Showing " << wanted.size () << " packages" << endl; - // find the objects for the names - ZyppPoolIterator - b = zyppPkgBegin(), - e = zyppPkgEnd(), - it; - for ( it = b; it != e; ++it ) - { - string name = (*it)->name(); // omitted theObj - - if ( wanted.find (name) != not_found ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); - if ( zyppPkg ) - { - sorted.push_back (*it); - } - } - } - - // sort it and insert it to the list - sort (sorted.begin (), sorted.end (), sortByName); - { - std::vector<ZyppSel>::iterator - b = sorted.begin (), - e = sorted.end (), - it; - for ( it = b; it != e; ++it ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); - // already know that it is valid - packageList->createListEntry( zyppPkg, *it ); - } - } - - // show the package table - packageList->setCurrentItem( 0 ); - packageList->drawList(); - packageList->showInformation(); - - return true; - -} /////////////////////////////////////////////////////////////////// // // NCursesEvent & showSelectionPopup () @@ -200,6 +139,8 @@ //ZyppLang langPtr = tryCastToZyppLang (objPtr); if (patPtr) { + packager->FilterDescription()->setText ( showDescription( objPtr ) ); + yuiMilestone() << "Show packages belonging to selected pattern: " << getCurrentLine() << endl; NCPkgTable * packageList = packager->PackageList(); @@ -210,9 +151,6 @@ } packageList->itemsCleared (); - // zypp::ui::PatternContents patternContents( patPtr ); - packager->FilterDescription()->setText ( showDescription( objPtr ) ); - // packages = patternContents.install_packages(); zypp::Pattern::Contents related ( patPtr->contents() ); for ( zypp::Pattern::Contents::Selectable_iterator it = related.selectableBegin(); it != related.selectableEnd(); @@ -264,7 +202,6 @@ } #endif - //showContainerContent( packages ); } } Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterConta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.h Fri Apr 18 12:44:46 2008 @@ -69,7 +69,6 @@ */ bool fillContainerList ( SelType type ); - bool showContainerContent( const set<string> & wanted ); string showDescription( ZyppObj objPtr ); /** -- 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] r46829 - /trunk/ncurses-pkg/src/NCPkgTable.h
by kmachalkova＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: kmachalkova Date: Fri Apr 18 12:43:49 2008 New Revision: 46829 URL: http://svn.opensuse.org/viewcvs/yast?rev=46829&view=rev Log: sort by name Modified: trunk/ncurses-pkg/src/NCPkgTable.h Modified: trunk/ncurses-pkg/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.h?rev… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.h (original) +++ trunk/ncurses-pkg/src/NCPkgTable.h Fri Apr 18 12:43:49 2008 @@ -166,7 +166,7 @@ /** * Draws the package list (has to be called after the loop with addLine() calls) */ - void drawList( ) { return DrawPad(); } + void drawList( ) { myPad()->setOrder(1); return DrawPad(); } /** * Clears the package list -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46828 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes
by dmacvicar＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: dmacvicar Date: Fri Apr 18 12:32:45 2008 New Revision: 46828 URL: http://svn.opensuse.org/viewcvs/yast?rev=46828&view=rev Log: - bump and changes Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=46828&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Apr 18 12:32:45 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "36") +SET(VERSION_PATCH "37") 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 Fri Apr 18 12:32:45 2008 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 18 11:41:32 CEST 2008 - dmacvicar(a)suse.de + +- make versions widget work (bnc #354983) +- show updates in blue again (bnc #371681) +- allow disabling view of debuginfo and devel pkgs + (bnc #359155) +- 2.16.37 + Thu Apr 17 22:17:53 CEST 2008 - dmacvicar(a)suse.de ------------------------------------------------------------------- -- 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] r46827 - /trunk/qt-pkg/src/YQPkgObjList.cc
by dmacvicar＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: dmacvicar Date: Fri Apr 18 12:32:44 2008 New Revision: 46827 URL: http://svn.opensuse.org/viewcvs/yast?rev=46827&view=rev Log: - allow disabling view of debuginfo and devel pkgs (bnc #359155) Modified: trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=4… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Fri Apr 18 12:32:44 2008 @@ -732,7 +732,7 @@ void YQPkgObjList::applyExcludeRules() -{ +{ // yuiDebug() << "Applying exclude rules" << endl; QTreeWidgetItemIterator listView_it( this ); @@ -794,6 +794,8 @@ { YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *>( listViewItem ); + std::cout << "apply exclude rules to item: " << item->zyppObj() << std::endl; + if ( item ) { bool exclude = false; @@ -836,37 +838,19 @@ void YQPkgObjList::exclude( YQPkgObjListItem * item, bool exclude ) { -#if FIXME if ( exclude == item->isExcluded() ) return; item->setExcluded( exclude ); - if ( exclude ) - { - QTreeWidgetItem * parentItem = item->parent(); - - if ( parentItem ) - parentItem->takeItem( item ); - else - QTreeWidget::takeItem( item ); - - _excludedItems->add( item, parentItem ); - } - else // un-exclude - { - if ( _excludedItems->contains( item ) ) - { - QTreeWidgetItem * oldParent = _excludedItems->oldParentItem( item ); - _excludedItems->remove( item ); + QTreeWidgetItem * parentItem = item->parent(); + + if ( parentItem ) + parentItem->setHidden(exclude); + else + item->setHidden(exclude); - if ( oldParent ) - oldParent->insertItem( item ); - else - QTreeWidget::insertItem( item ); - } - } -#endif + _excludedItems->add( item, parentItem ); } -- 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] r46826 - /trunk/qt-pkg/src/YQPkgObjList.cc
by dmacvicar＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: dmacvicar Date: Fri Apr 18 12:32:43 2008 New Revision: 46826 URL: http://svn.opensuse.org/viewcvs/yast?rev=46826&view=rev Log: - show updates in blue again (bnc #371681) Modified: trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=4… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Fri Apr 18 12:32:43 2008 @@ -972,6 +972,9 @@ { if ( installed->edition() > candidate->edition() ) setTextColor( versionStatusCol(), Qt::red); + if ( installed->edition() < candidate->edition() ) + setTextColor( versionStatusCol(), Qt::blue); + setText( versionStatusCol(), QString().sprintf("%s (%s)", installed->edition().c_str(), candidate->edition().c_str()) ); } -- 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] r46825 - /trunk/qt-pkg/src/YQPkgVersionsView.cc
by dmacvicar＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: dmacvicar Date: Fri Apr 18 12:32:41 2008 New Revision: 46825 URL: http://svn.opensuse.org/viewcvs/yast?rev=46825&view=rev Log: make versions widget work (bnc #354983) Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Fri Apr 18 12:32:41 2008 @@ -74,8 +74,6 @@ _userCanSwitch = userCanSwitch; _buttons = new QButtonGroup(parent); - - connect( _buttons, SIGNAL(clicked(QAbstractButton *)), SLOT(checkForChangedCandidate()) ); if ( _parentTab ) { @@ -182,6 +180,8 @@ while ( it != selectable->availableEnd() ) { QRadioButton *b = new YQPkgVersion( this, selectable, *it, _userCanSwitch ); + connect( b, SIGNAL(clicked(bool)), SLOT(checkForChangedCandidate()) ); + _buttons->addButton(b); _layout->addWidget(b); @@ -203,68 +203,67 @@ void YQPkgVersionsView::checkForChangedCandidate() -{ - - QListIterator<QAbstractButton*> it(_buttons->buttons()); - while (it.hasNext()) - { - YQPkgVersion * versionItem = dynamic_cast<YQPkgVersion *> (it.next()); - - if ( versionItem && versionItem->isChecked() ) - { - ZyppObj newCandidate = versionItem->zyppObj(); - - if ( newCandidate != _selectable->candidateObj() ) - { - yuiMilestone() << "Candidate changed" << endl; - - // Change status of selectable - - ZyppStatus status = _selectable->status(); - - if ( !_selectable->installedEmpty() && - _selectable->installedObj()->arch() == newCandidate->arch() && - _selectable->installedObj()->edition() == newCandidate->edition() ) - { - // Switch back to the original instance - - // the version that was previously installed +{ + QListIterator<QAbstractButton*> it(_buttons->buttons()); + while (it.hasNext()) + { + YQPkgVersion * versionItem = dynamic_cast<YQPkgVersion *> (it.next()); + + if ( versionItem && versionItem->isChecked() ) + { + ZyppObj newCandidate = versionItem->zyppObj(); + + if ( newCandidate != _selectable->candidateObj() ) + { + yuiMilestone() << "Candidate changed" << endl; + + // Change status of selectable + + ZyppStatus status = _selectable->status(); + + if ( !_selectable->installedEmpty() && + _selectable->installedObj()->arch() == newCandidate->arch() && + _selectable->installedObj()->edition() == newCandidate->edition() ) + { + // Switch back to the original instance - + // the version that was previously installed status = S_KeepInstalled; - } - else - { - switch ( status ) - { - case S_KeepInstalled: - case S_Protected: - case S_AutoDel: - case S_AutoUpdate: - case S_Del: - case S_Update: - - status = S_Update; - break; - - case S_NoInst: - case S_Taboo: - case S_Install: - case S_AutoInstall: - status = S_Install; - break; - } - } - - _selectable->setStatus( status ); - - - // Set candidate - - _selectable->setCandidate( newCandidate ); - emit candidateChanged( newCandidate ); - return; - } - } - - } + } + else + { + switch ( status ) + { + case S_KeepInstalled: + case S_Protected: + case S_AutoDel: + case S_AutoUpdate: + case S_Del: + case S_Update: + + status = S_Update; + break; + + case S_NoInst: + case S_Taboo: + case S_Install: + case S_AutoInstall: + status = S_Install; + break; + } + } + + _selectable->setStatus( status ); + + + // Set candidate + + _selectable->setCandidate( newCandidate ); + emit candidateChanged( newCandidate ); + return; + } + } + + } } -- 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] r46824 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/PkgFunctions.h src/Target_Load.cc
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 11:53:53 2008 New Revision: 46824 URL: http://svn.opensuse.org/viewcvs/yast?rev=46824&view=rev Log: - added Pkg::TargetRebuildInit(string root) function which rebuilds the RPM DB ('rpm --rebuilddb') before initializing the target (bnc#308352) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/PkgFunctions.h trunk/pkg-bindings/src/Target_Load.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Apr 18 11:53:53 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 18 11:52:11 CEST 2008 - lslezak(a)suse.cz + +- added Pkg::TargetRebuildInit(string root) function which rebuilds + the RPM DB ('rpm --rebuilddb') before initializing the target + (bnc#308352) + +------------------------------------------------------------------- Thu Apr 17 13:04:03 CEST 2008 - schubi(a)suse.de - do not iterate over the repo's if the target does not exist. Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Fri Apr 18 11:53:53 2008 @@ -119,6 +119,7 @@ YCPValue GetPkgLocation(const YCPString& p, bool full_path); YCPValue PkgProp( zypp::PoolItem item ); YCPValue PkgMediaSizesOrCount (bool sizes); + YCPValue TargetInitInternal(const YCPString& root, bool rebuild_rpmdb); bool aliasExists(const std::string &alias) const; @@ -506,6 +507,8 @@ // target related /* TYPEINFO: boolean(string,boolean)*/ YCPValue TargetInit (const YCPString& root, const YCPBoolean& unused); + /* TYPEINFO: boolean(string)*/ + YCPValue TargetRebuildInit(const YCPString& root); /* TYPEINFO: boolean(string)*/ YCPValue TargetInitialize (const YCPString& root); /* TYPEINFO: boolean()*/ Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Fri Apr 18 11:53:53 2008 @@ -38,17 +38,8 @@ Textdomain "pkg-bindings" */ -/** ------------------------ - * - * @builtin TargetInit - * @deprecated - * @short Initialize Target and load resolvables - * @param string root Root Directory - * @param boolean unused Dummy option, only for backward compatibility - * @return boolean - */ YCPValue -PkgFunctions::TargetInit (const YCPString& root, const YCPBoolean & /*unused_and_broken*/) +PkgFunctions::TargetInitInternal(const YCPString& root, bool rebuild_rpmdb) { const std::string r(root->value()); @@ -69,7 +60,12 @@ try { - zypp_ptr()->initializeTarget(r); + if (rebuild_rpmdb) + { + y2milestone("Initializing the target with rebuild"); + } + + zypp_ptr()->initializeTarget(r, rebuild_rpmdb); pkgprogress.NextStage(); zypp_ptr()->target()->load(); _target_loaded = true; @@ -90,6 +86,34 @@ /** ------------------------ * + * @builtin TargetInit + * @short Initialize Target and load resolvables + * @param string root Root Directory + * @param boolean unused Dummy option, only for backward compatibility + * @return boolean + */ +YCPValue +PkgFunctions::TargetInit (const YCPString& root, const YCPBoolean & /*unused_and_broken*/) +{ + return TargetInitInternal(root, false); +} + +/** ------------------------ + * + * @builtin TargetRebuildInit + * @short Similar to TargetInit, but the RPM DB is rebuilt ('rpm --rebuilddb') before reading it + * @param string root Root Directory + * @param boolean unused Dummy option, only for backward compatibility + * @return boolean + */ +YCPValue +PkgFunctions::TargetRebuildInit(const YCPString& root) +{ + return TargetInitInternal(root, true); +} + +/** ------------------------ + * * @builtin TargetInitialize * @short Initialize Target, read the keys. * @param string root Root Directory -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0