- YaST Commits

[yast-commit] r38312 - /trunk/ncurses/src/pkg/NCPkgStatusStrategy.cc
by gs＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: gs Date: Wed Jun 6 14:58:11 2007 New Revision: 38312 URL: http://svn.opensuse.org/viewcvs/yast?rev=38312&view=rev Log: transactReskind() is obsolete -> use resolvePool() Modified: trunk/ncurses/src/pkg/NCPkgStatusStrategy.cc Modified: trunk/ncurses/src/pkg/NCPkgStatusStrategy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgStatusStrategy.cc (original) +++ trunk/ncurses/src/pkg/NCPkgStatusStrategy.cc Wed Jun 6 14:58:11 2007 @@ -290,7 +290,10 @@ void NCPkgStatusStrategy::solveResolvableCollections() { zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); - + // transactReskind() is obsolete -> use resolvePool() + resolver->resolvePool(); + +#if 0 resolver->transactReset( zypp::ResStatus::APPL_LOW ); resolver->transactResKind( zypp::ResTraits<zypp::Product>::kind ); @@ -299,6 +302,7 @@ resolver->transactResKind( zypp::ResTraits<zypp::Language >::kind ); resolver->transactResKind( zypp::ResTraits<zypp::Patch >::kind ); resolver->transactResKind( zypp::ResTraits<zypp::Atom >::kind ); +#endif } @@ -522,8 +526,8 @@ NCMIL << "Set status of: " << slbPtr->name() << " to: " << newstatus << " returns: " << (ok?"true":"false") << endl; - // do a solver run - solveResolvableCollections(); + // do a solver run -> solver runs in NCPkgTable::changeStatus() + // solveResolvableCollections(); return ok; } -- 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] r38311 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_helptexts.ycp storage/src/inst_custom_part.ycp
by fehr＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: fehr Date: Wed Jun 6 13:57:13 2007 New Revision: 38311 URL: http://svn.opensuse.org/viewcvs/yast?rev=38311&view=rev Log: fix typos in translatable texts (#233645) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_helptexts.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jun 6 13:57:13 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 6 13:56:50 CEST 2007 - fehr(a)suse.de + +- fix typos in translatable texts (#233645) + +------------------------------------------------------------------- Mon Jun 4 13:06:28 CEST 2007 - fehr(a)suse.de - fix missing ldconfig call detect by RPMLINT Modified: trunk/storage/storage/src/include/custom_part_helptexts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_helptexts.ycp (original) +++ trunk/storage/storage/src/include/custom_part_helptexts.ycp Wed Jun 6 13:57:13 2007 @@ -157,7 +157,7 @@ // helptext for popup create partition line 5 of 6 helptextCR = helptextCR + _("After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66)."); // helptext for popup create partition line 6 of 6 - helptextCR = helptextCR + _("It is also possible to specify the size of the partition directly (e.g., +100M or +20000K))"); + helptextCR = helptextCR + _("It is also possible to specify the size of the partition directly (e.g., +100M or +20000K)."); } } return( helptextCR ); @@ -169,7 +169,7 @@ // helptext for popup create extended partition line string helptextCR = _("Enter the starting cylinder number of the partition. After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66). -It is also possible to specify the size of the partition directly (e.g., +2G, +100M, or +20000K) +It is also possible to specify the size of the partition directly (e.g., +2G, +100M, or +20000K). "); return( helptextCR ); }; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Jun 6 13:57:13 2007 @@ -1250,8 +1250,7 @@ Popup::Error(_("The value for the partition end is invalid. Enter the end cylinder number (such as 77), an offset (like +122), -or the size of the partition (for example, +100M or 1.8GB ) -")); +or the size of the partition (for example, +100M or 1.8GB).")); } else { -- 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] r38310 - /trunk/ncurses/src/NCPkgTable.cc
by gs＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: gs Date: Wed Jun 6 13:18:22 2007 New Revision: 38310 URL: http://svn.opensuse.org/viewcvs/yast?rev=38310&view=rev Log: show correct versions of patch packages Modified: trunk/ncurses/src/NCPkgTable.cc Modified: trunk/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPkgTable.cc?rev=38… ============================================================================== --- trunk/ncurses/src/NCPkgTable.cc (original) +++ trunk/ncurses/src/NCPkgTable.cc Wed Jun 6 13:18:22 2007 @@ -609,19 +609,24 @@ switch( tableType ) { case T_PatchPkgs: { + // if the package is installed, get the installed version if ( slbPtr->hasInstalledObj() ) { instVersion = slbPtr->installedObj()->edition().asString(); } - - // in case of YOU patches: show the version of the package which - // is contained in the patch - version = pkgPtr->edition().asString(); + // if a candidate is available, get the candidate version + if ( slbPtr->hasCandidateObj() ) + { + version = slbPtr->candidateObj()->edition().asString(); + } + else + { + version = pkgPtr->edition().asString(); + } pkgLine.push_back( version ); - // if ( Y2PM::instTarget().numPackages() > 0 ) - // doesn't make sense for YOU mode because there are always installed packages - // -> show installed version or empty column + // in case of YOU there are always installed packages + // => always add installed version (or empty column) pkgLine.push_back( instVersion ); pkgLine.push_back( pkgPtr->summary() ); // short description -- 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] r38309 - /trunk/ncurses/src/pkg/NCPackageSelector.cc
by gs＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: gs Date: Wed Jun 6 13:17:56 2007 New Revision: 38309 URL: http://svn.opensuse.org/viewcvs/yast?rev=38309&view=rev Log: additionally show installed packages in list of package versions Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed Jun 6 13:17:56 2007 @@ -507,6 +507,8 @@ // bool NCPackageSelector::fillAvailableList( NCPkgTable * pkgTable, ZyppSel selectable ) { + bool addInstalled = true; + if ( !pkgTable ) { NCERR << "No table widget for available packages existing" << endl; @@ -518,7 +520,7 @@ NCERR << "Package pointer not valid" << endl; return false; } - + // clear the package table pkgTable->itemsCleared (); @@ -531,9 +533,20 @@ it; for (it = b; it != e; ++it) { + if ( selectable->installedObj() && + selectable->installedObj()->edition() == (*it)->edition() && + selectable->installedObj()->arch() == (*it)->arch() ) + // FIXME: In future releases, also the vendor will make a difference + { + addInstalled = false; + } pkgTable->createListEntry( tryCastToZyppPkg (*it), selectable ); } - + if ( selectable->hasInstalledObj() && addInstalled ) + { + pkgTable->createListEntry( tryCastToZyppPkg (selectable->installedObj()), selectable ); + } + // show the package list pkgTable->drawList(); @@ -893,12 +906,12 @@ // bool NCPackageSelector::fillPatchPackages ( NCPkgTable * pkgTable, ZyppObj objPtr, bool versions ) { - if ( !pkgTable ) + if ( !pkgTable || !objPtr ) return false; + pkgTable->itemsCleared (); std::set<ZyppSel> patchSelectables; - ZyppPatch patchPtr = tryCastToZyppPatch( objPtr ); if ( !patchPtr ) @@ -913,16 +926,15 @@ it != patchContents.end(); ++it ) { - ZyppPkg pkg = tryCastToZyppPkg( *it ); if ( pkg ) { NCMIL << "Patch package found: " << (*it)->name().c_str() << endl; - ZyppSel sel = selMapper.findZyppSel( pkg ); if ( sel ) + { if ( contains( patchSelectables, sel ) ) { NCMIL << "Suppressing duplicate selectable: " << (*it)->name().c_str() << "-" << @@ -932,25 +944,32 @@ else { patchSelectables.insert( sel ); + NCDBG << (*it)->name().c_str() << ": Version: " << pkg->edition().asString() << endl; - if ( versions ) + pkgTable->createListEntry( pkg, sel ); + + if ( versions ) // additionally show all availables { - // show all availables zypp::ui::Selectable::available_iterator b = sel->availableBegin (), e = sel->availableEnd (), it; for (it = b; it != e; ++it) { - pkgTable->createListEntry( tryCastToZyppPkg (*it), sel ); + ZyppPkg pkgAvail = tryCastToZyppPkg (*it); + if ( pkgAvail ) + { + if ( pkg->edition() != pkgAvail->edition() || + pkg->arch() != pkgAvail->arch() ) + { + pkgTable->createListEntry( pkgAvail, sel ); + } + } } - } - else - { - pkgTable->createListEntry( pkg, sel ); - } - } + } // if ( versions ) + } + } } else // No ZyppPkg - some other kind of object (script, message) { -- 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] r38308 - /tags/stable-2_15_7/repair/
by jsuchome＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: jsuchome Date: Wed Jun 6 12:54:53 2007 New Revision: 38308 URL: http://svn.opensuse.org/viewcvs/yast?rev=38308&view=rev Log: Created tag stable-2_15_7 for repair Added: tags/stable-2_15_7/repair/ - copied from r38307, trunk/repair/ -- 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] r38307 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRCommon.ycp src/OSRPkgUI.ycp src/OSRPopup.ycp
by jsuchome＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: jsuchome Date: Wed Jun 6 12:54:42 2007 New Revision: 38307 URL: http://svn.opensuse.org/viewcvs/yast?rev=38307&view=rev Log: - remember the packages selected for reinstallation (#278512) - 2.15.7 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRCommon.ycp trunk/repair/src/OSRPkgUI.ycp trunk/repair/src/OSRPopup.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=38307&r1=3830… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Wed Jun 6 12:54:42 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Wed Jun 6 12:54:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 6 12:53:50 CEST 2007 - jsuchome(a)suse.cz + +- remember the packages selected for reinstallation (#278512) +- 2.15.7 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/repair/src/OSRCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRCommon.ycp?rev=383… ============================================================================== --- trunk/repair/src/OSRCommon.ycp (original) +++ trunk/repair/src/OSRCommon.ycp Wed Jun 6 12:54:42 2007 @@ -63,7 +63,12 @@ return []; } - +/** + * @return [] + */ +global define list EmptyListWithParam (list param) { + return []; +} // --------------------------------------------------------------------- // from OSRDirect.ycp: Modified: trunk/repair/src/OSRPkgUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkgUI.ycp?rev=3830… ============================================================================== --- trunk/repair/src/OSRPkgUI.ycp (original) +++ trunk/repair/src/OSRPkgUI.ycp Wed Jun 6 12:54:42 2007 @@ -684,10 +684,18 @@ return item_list; } - global define list ProtocolDialog()``{ + /** + * Show the detailed list of packages that failed to be verified, together with + * rpm -V output. User can review the errors and choose the packages to reinstall. + * @param selected packages selected for reinstallation in the selection box + * @return packages that are selected for reinstallation + */ + global define list ProtocolDialog (list selected) { protocol_mode = true; + packages_to_reinstall = selected; + UI::OpenDialog( get_verify_dialog() ); symbol ret = `next; Modified: trunk/repair/src/OSRPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPopup.ycp?rev=3830… ============================================================================== --- trunk/repair/src/OSRPopup.ycp (original) +++ trunk/repair/src/OSRPopup.ycp Wed Jun 6 12:54:42 2007 @@ -508,7 +508,7 @@ foreach ( list special_button, special_buttons_list, ``{ special_buttons = add( special_buttons, special_button[0]:`Empty()); special_symbol_to_action[special_button[1]:`empty] = - special_button[2]:OSRCommon::EmptyList; + special_button[2]:OSRCommon::EmptyListWithParam; }); term multi_box_with_text = `VBox(`Left(`Label(message_top )), `VSpacing(1), @@ -546,9 +546,11 @@ // eval special button action define. if ( haskey( special_symbol_to_action, ret )) { - list () f =special_symbol_to_action[ret]:OSRCommon::EmptyList; + list selected_for_reinstall = (list) + UI::QueryWidget (`id(`selection_box), `SelectedItems); + list (list) f =special_symbol_to_action[ret]:OSRCommon::EmptyListWithParam; UI::ReplaceWidget(`id(`rp), - build_multi_box(box_headline, (list<list>) f())); + build_multi_box(box_headline, (list<list>) f(selected_for_reinstall))); } } } -- 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] r38306 - /tags/stable-2_15_6/tv/
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 11:22:34 2007 New Revision: 38306 URL: http://svn.opensuse.org/viewcvs/yast?rev=38306&view=rev Log: Created tag stable-2_15_6 for tv Added: tags/stable-2_15_6/tv/ - copied from r38305, trunk/tv/ -- 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] r38305 - in /trunk/tv: VERSION data/CARDLIST.ivtv data/Makefile.am data/create_tv_db data/tv_dvbcards.ycp data/tv_dvbfirmware.ycp package/yast2-tv.changes src/Tv.ycp
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 11:16:24 2007 New Revision: 38305 URL: http://svn.opensuse.org/viewcvs/yast?rev=38305&view=rev Log: - support for ivtv based TV cards (#130098) - install firmware/packages before loading drivers - updated DVB card DB (#222806, #223188) - 2.15.6 Added: trunk/tv/data/CARDLIST.ivtv Modified: trunk/tv/VERSION trunk/tv/data/Makefile.am trunk/tv/data/create_tv_db trunk/tv/data/tv_dvbcards.ycp trunk/tv/data/tv_dvbfirmware.ycp trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=38305&r1=38304&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Wed Jun 6 11:16:24 2007 @@ -1 +1 @@ -2.15.5 +2.15.6 Added: trunk/tv/data/CARDLIST.ivtv URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.ivtv?rev=38305&… ============================================================================== --- trunk/tv/data/CARDLIST.ivtv (added) +++ trunk/tv/data/CARDLIST.ivtv Wed Jun 6 11:16:24 2007 @@ -0,0 +1,18 @@ + 1 -> Hauppauge WinTV PVR-250 + 2 -> Hauppauge WinTV PVR-350 + 3 -> Hauppauge WinTV PVR-150 or PVR-500 + 4 -> AVerMedia M179 [1461:a3ce,1461:a3cf] + 5 -> Yuan MPG600/Kuroutoshikou iTVC16-STVLP [12ab:fff3,12ab:ffff] + 6 -> Yuan MPG160/Kuroutoshikou iTVC15-STVLP [12ab:0000,10fc:40a0] + 7 -> Yuan PG600/DiamondMM PVR-550 [ff92:0070,ffab:0600] + 8 -> Adaptec AVC-2410 [9005:0093] + 9 -> Adaptec AVC-2010 [9005:0092] +10 -> NAGASE TRANSGEAR 5000TV [1461:bfff] +11 -> AOpen VA2000MAX-STN6 [0000:ff5f] +12 -> YUAN MPG600GR/Kuroutoshikou CX23416GYC-STVLP [12ab:0600,fbab:0600,1154:0523] +13 -> I/O Data GV-MVP/RX [10fc:d01e,10fc:d038,10fc:d039] +14 -> I/O Data GV-MVP/RX2E [10fc:d025] +15 -> GOTVIEW PCI DVD (partial support only) [12ab:0600] +16 -> GOTVIEW PCI DVD2 Deluxe [ffac:0600] +17 -> Yuan MPC622 [ff01:d998] +18 -> Digital Cowboy DCT-MTVP1 [1461:bfff] Modified: trunk/tv/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/Makefile.am?rev=38305&r1… ============================================================================== --- trunk/tv/data/Makefile.am (original) +++ trunk/tv/data/Makefile.am Wed Jun 6 11:16:24 2007 @@ -6,13 +6,13 @@ ydata_DATA = tv_cards-lirc_gpio.ycp tv_cards.ycp tv_tuners.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp -tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 +tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv $(srcdir)/create_tv_db $^ > $@ tv_tuners.ycp: CARDLIST.tuner $(srcdir)/create_tuner_db $^ > $@ -EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.tuner\ +EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.tuner\ create_tv_db create_tuner_db tv_cards-lirc_gpio.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp # delete generated files Modified: trunk/tv/data/create_tv_db URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/create_tv_db?rev=38305&r… ============================================================================== --- trunk/tv/data/create_tv_db (original) +++ trunk/tv/data/create_tv_db Wed Jun 6 11:16:24 2007 @@ -5,6 +5,7 @@ # $1 - the CARDLIST.bttv source file # $2 - the CARDLIST.saa7134 source file # $3 - the CARDLIST.cx88 source file +# $4 - the CARDLIST.ivtv source file # ...more to come... if ($#ARGV < 1) @@ -16,6 +17,7 @@ $bttv_cardlist_fname = $ARGV[0]; $saa7134_cardlist_fname = $ARGV[1]; $cx88_cardlist_fname = $ARGV[2]; +$ivtv_cardlist_fname = $ARGV[3]; # ... more to come ... # Names to translate @@ -149,6 +151,7 @@ push @cards, ReadDatabase($bttv_cardlist_fname, "bttv"); push @cards, ReadDatabase($saa7134_cardlist_fname, "saa7134"); push @cards, ReadDatabase($cx88_cardlist_fname, "cx88xx"); +push @cards, ReadDatabase($ivtv_cardlist_fname, "ivtv"); #...more to come... # Sort @cards Modified: trunk/tv/data/tv_dvbcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/tv_dvbcards.ycp?rev=3830… ============================================================================== --- trunk/tv/data/tv_dvbcards.ycp (original) +++ trunk/tv/data/tv_dvbcards.ycp Wed Jun 6 11:16:24 2007 @@ -24,7 +24,21 @@ $[ "name" : "B2C2 FlexCopII DVB chip / Technisat SkyStar2 DVB card", "module" : [ "b2c2-flexcop-pci", "mt312" ] - ] + ], + // (#222806) + $[ + "name" : "Nova-T DVB-T Model 909", + "module" : [ "cx88_dvb", "bcm3510" ] + ], + // (#223188) + $[ + "name" : "Twinhan VisionPlus DVB-T", + "module" : [ "dvb-bt8xx", "bcm3510" ] + ], + $[ + "name" : "AVermedia DVB-T 771", + "module" : [ "dvb-bt8xx", "mt352" ] + ], ] ] ]; Modified: trunk/tv/data/tv_dvbfirmware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/tv_dvbfirmware.ycp?rev=3… ============================================================================== --- trunk/tv/data/tv_dvbfirmware.ycp (original) +++ trunk/tv/data/tv_dvbfirmware.ycp Wed Jun 6 11:16:24 2007 @@ -132,6 +132,13 @@ ] ] ], + + "ivtv" : + [ + $[ + "packages" : [ "ivtv", "ivtv-firmware", "ivtv-kmp-default" ] + ] + ], ]; } Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Wed Jun 6 11:16:24 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jun 6 10:30:42 CEST 2007 - lslezak(a)suse.cz + +- support for ivtv based TV cards (#130098) +- install firmware/packages before loading drivers +- updated DVB card DB (#222806, #223188) +- 2.15.6 + +------------------------------------------------------------------- Mon Jun 4 14:35:57 CEST 2007 - lslezak(a)suse.cz - tv card DB updated to kernel-default-2.6.21-12 Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=38305&r1=38304… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Wed Jun 6 11:16:24 2007 @@ -1248,6 +1248,8 @@ y2milestone("required modules with FW: %1", reqmod); + list<string> packages_to_install = []; + if (size(reqmod) > 0) { foreach(string drv, reqmod, { @@ -1255,24 +1257,29 @@ string cardname = "TV"; // is the firmware really needed? - boolean firmware_needed = false; + boolean firmware_needed = nil; foreach(map card, (list<map>) cards, { list<string> drvs = card["module"]:[]; - - if (card["fw_install"]:true) - { - firmware_needed = true; - } - if (contains(drvs, drv)) { cardname = card["name"]:"TV"; + + // install the firmware? + boolean inst = card["fw_install"]:true; + if (firmware_needed == nil) + { + firmware_needed = inst; + } + else + { + firmware_needed = firmware_needed || inst; + } } } ); - if (firmware_needed) + if (firmware_needed == false) { y2milestone("Skipping firmware installation for driver '%1' (card '%2')", drv, cardname); continue; @@ -1281,19 +1288,27 @@ list<map<string,any> > fws = (list<map<string,any> >)firmware_database[drv]:[]; foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + list<string> required_packages = fw["packages"]:[]; - boolean inst = IsFWInstalled(firmware_prefix + target); - if (inst) + if (size(required_packages) > 0) { - // the firmware is already installed - y2milestone("Firmware %1 has been already installed.", firmware_prefix + target); - continue; + y2milestone("Driver %1 requires these packages: %2", drv, required_packages); + packages_to_install = (list<string>)union(packages_to_install, required_packages); } + string target = fw["target"]:""; + string source = fw["source"]:""; + if (target != nil && target != "" && source != nil && source != "") { + boolean inst = IsFWInstalled(firmware_prefix + target); + if (inst) + { + // the firmware is already installed + y2milestone("Firmware %1 has been already installed.", firmware_prefix + target); + continue; + } + boolean install = true; // install fw in a loop until it succeeds or a wrong fw is confirmed @@ -1365,6 +1380,21 @@ } ); + + y2milestone("Collected packages: %1", packages_to_install); + + if (size(packages_to_install) > 0) + { + // do not install the packages again + packages_to_install = filter(string pkg, packages_to_install, {return !Package::Installed(pkg);}); + + y2milestone("Packages to install: %1", packages_to_install); + + if (size(packages_to_install) > 0) + { + ret = ret && Package::DoInstall(packages_to_install); + } + } } return ret; @@ -2098,30 +2128,55 @@ // Summary text (%1 is number) _("Installed as DVB card number %1."), dvbcard_no); - if (firmware_database != nil && size(firmware_database) > 0) - { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + } + else + { + installed_str = sformat( + // Summary text (%1 is number) + _("Installed as TV card number %1"), card_no); + } - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + if (firmware_database != nil && size(firmware_database) > 0) + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + + if (target != "" && source != "") + { boolean inst = IsFWInstalled(firmware_prefix + target); installed_str = installed_str + " " + _("Firmware: ") + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1)"), source)); } - ); - } + + // add packages + list<string> required_packages = fw["packages"]:[]; + + if (size(required_packages) > 0) + { + y2milestone("Required packages for driver %1: %2", fwmod, required_packages); + } + + foreach(string pkg, required_packages, + { + // summary string, %1 is a package name, %2 is a status string: installed + installed_str = installed_str + " " + sformat(_("Package: %1 (%2)"), + // package status + pkg, Package::Installed(pkg) ? _("Installed") : _("Not Installed")); + } + ); + } + ); + } - ); - } + } + ); } - else - installed_str = sformat( - // Summary text (%1 is number) - _("Installed as TV card number %1"), card_no); + card_item = Summary::Device(name, installed_str); } @@ -2470,33 +2525,51 @@ } // add firmware data if available - if (isdvb) + if (firmware_database != nil && size(firmware_database) > 0) { - if (firmware_database != nil && size(firmware_database) > 0) + if (card["fw_install"]:nil == false) { - if (card["fw_install"]:nil == false) - { - y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); - } - else - { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); + } + else + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + + if (target != "" && source != "") + { boolean inst = IsFWInstalled(firmware_prefix + target); descr = add(descr, _("Firmware: ") + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); } - ); - } + + // any required package? + list<string> required_packages = fw["packages"]:[]; + + if (size(required_packages) > 0) + { + y2milestone("Required packages for driver %1: %2", fwmod, required_packages); + } + + foreach(string pkg, required_packages, + { + // summary string, %1 is a package name, %2 is a status string: installed + descr = add(descr, sformat(_("Package: %1 (%2)"), + // package status + pkg, Package::Installed(pkg) ? _("Installed") : _("Not Installed"))); + } + ); + } + ); } - ); - } + } + ); } } @@ -3290,18 +3363,18 @@ list<string> stages = [ // Progress stage - _("Write the settings"), - // Progress stage _("Install firmware"), // Progress stage + _("Write the settings"), + // Progress stage _("Update sound volume")]; list steps = [ // Progress step - _("Writing the settings..."), - // Progress step _("Installing firmware..."), // Progress step + _("Writing the settings..."), + // Progress step _("Updating the sound volume...")]; if (!not_ask) @@ -3334,7 +3407,14 @@ y2debug("cards: %1", cards); - // Write the settings + // Install firmware + Progress::NextStage (); + + if (cards_dirty && !InstallFW()) + { + return false; + } + Progress::NextStage (); // install required kernel packages @@ -3345,17 +3425,12 @@ Package::InstallKernel(kernelmodules); } + // Write the settings if (cards_dirty && !WriteSettings()) { return false; } - Progress::NextStage (); - if (cards_dirty && !InstallFW()) - { - return false; - } - // Write the sound volume Progress::NextStage (); if (cards_dirty && !WriteSoundVolume()) -- 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] r38304 - in /trunk/yast2: library/packages/src/PackageLock.ycp package/yast2.changes
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 21:24:53 2007 New Revision: 38304 URL: http://svn.opensuse.org/viewcvs/yast?rev=38304&view=rev Log: - Extended PackageLock::Check function to allow to 'Retry' getting the package management lock (#280383). 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 Tue Jun 5 21:24:53 2007 @@ -14,9 +14,11 @@ module "PackageLock"; textdomain "base"; -import "Report"; +import "Popup"; +import "Label"; boolean have_lock = nil; + /** * Tries to acquire the packager (zypp) lock. * Reports an error if another process has the lock already. @@ -24,18 +26,40 @@ * @return true if we can continue */ global boolean Check () { - if (have_lock == nil) - { + // we already have a lock + if (have_lock != nil) return have_lock; + + // just to allow 'Retry', see more in bug #280383 + 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) - { - Report::Error (_("Another process is accessing the package database. + if (have_lock == true) break; + + if (have_lock != true) { + try_again = (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. -")); - // ContinueCancel? What about CLI? + +Would you like to continue without having access +to the package management or retry to access it? +"), + Label::ContinueButton(), + Label::RetryButton(), + // 'Continue' instead of 'Retry' + `focus_yes + ) == false); } + + if (try_again) y2milestone ("User decided to retry..."); } + + y2milestone ("PackageLock::Check result: %1", have_lock); return have_lock; } 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 Tue Jun 5 21:24:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 5 21:22:50 CEST 2007 - locilka(a)suse.cz + +- Extended PackageLock::Check function to allow to 'Retry' getting + the package management lock (#280383). + +------------------------------------------------------------------- Fri Jun 1 09:51:24 CEST 2007 - mzugec(a)suse.cz - add function NetworkService::isNetworkRunning() -- 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] r38303 - /tags/stable-2_16_1/vm/
by charlesa＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: charlesa Date: Tue Jun 5 18:48:33 2007 New Revision: 38303 URL: http://svn.opensuse.org/viewcvs/yast?rev=38303&view=rev Log: Created tag stable-2_16_1 for vm Added: tags/stable-2_16_1/vm/ - copied from r38302, trunk/vm/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0