From 38d938879ce5613cc4246b7defa85c57ced7b2d8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 May 2009 22:43:20 +0000 Subject: revert debug bits that wrongly went in --- ChangeLog | 741 -------------------------------------------------------- MandrivaUpdate | 27 +-- Rpmdrake/gui.pm | 14 +- Rpmdrake/pkg.pm | 24 +- gui.lst | 29 +-- rpmdrake | 20 +- 6 files changed, 29 insertions(+), 826 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7ba1931..862d142c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,744 +1,3 @@ -2009-03-30 13:35 Thierry Vignaud - - * po/fr.po: update - -2009-03-30 13:34 Thierry Vignaud - - * po/af.po, po/am.po, po/ar.po, po/az.po, po/be.po, po/bg.po, - po/bn.po, po/br.po, po/bs.po, po/ca.po, po/cs.po, po/cy.po, - po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, - po/eu.po, po/fa.po, po/fi.po, po/fr.po, po/fur.po, po/ga.po, - po/gl.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/hy.po, - po/id.po, po/is.po, po/it.po, po/ja.po, po/ka.po, po/ko.po, - po/ku.po, po/ky.po, po/lt.po, po/ltg.po, po/lv.po, po/mk.po, - po/mn.po, po/ms.po, po/mt.po, po/nb.po, po/nl.po, po/nn.po, - po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, - po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, po/sl.po, - po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, po/tg.po, - po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, - po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: - sync wsith code - -2009-03-27 19:49 Karl Ove Hufthammer - - * po/nn.po: Updated Norwegian Nynorsk translation. - -2009-03-27 04:54 olorin - - * po/nb.po: update for Norwegian Bokmål translation - -2009-03-26 18:45 Thierry Vignaud - - * rpmdrake.pm: (show_urpm_progress) there's a bug since r17036 from - gc on 2003-08-07 - where we display misplaced quotes such as "downloading `foobar - from - 'medium Main Updates'´" - -2009-03-26 18:42 Thierry Vignaud - - * NEWS, rpmdrake.pm: (show_urpm_progress) prevent dialog to enlarge - too much when - displaying downloads of media meta_data (eg: adding or updating - media) - -2009-03-26 11:09 Thierry Vignaud - - * NEWS: list initial bug report in latest commit instead - -2009-03-26 10:29 Thierry Vignaud - - * NEWS, gurpmi.addmedia: fix success message when adding mirrorlist - (#48660) - -2009-03-26 10:20 Thierry Vignaud - - * gurpmi.addmedia: extract message so that the code is clearer - -2009-03-25 15:56 Thierry Vignaud - - * Makefile, NEWS: 5.13 - -2009-03-25 12:10 Thierry Vignaud - - * rpmdrake: (quit) perl_checker cleanup - -2009-03-25 12:09 Thierry Vignaud - - * NEWS, rpmdrake: (run_treeview_dialog) do not use Gtk2::Sexy - anymore (sligthly reduce - memory usage) (needs drakxtools > 12.17.1) - -2009-03-25 12:01 Pavel Maryanov - - * po/ru.po: russian translation updated - -2009-03-24 09:22 Thierry Vignaud - - * NEWS, gui.lst: update GUI package list (#49086) - -2009-03-21 20:18 gustav - - * po/bg.po: update translation for Bulgarian language - -2009-03-21 17:14 Keld Jørn Simonsen - - * po/da.po: updates - -2009-03-20 19:24 Marek Laane - - * po/et.po: Fix stupid typo. - -2009-03-20 16:57 olorin - - * po/nb.po: update for Norwegian Bokmål translation - -2009-03-20 14:55 Thierry Vignaud - - * Makefile, NEWS: 5.12 - -2009-03-20 14:54 Thierry Vignaud - - * NEWS, Rpmdrake/pkg.pm: (get_pkgs) select updates from all media - on cooker instead of only from update media - -2009-03-20 04:03 bedi - - * po/pt_BR.po: updated for pt_BR - -2009-03-19 23:29 Pjetur G. Hjaltason - - * po/is.po: Spelling and updates - -2009-03-19 18:48 olorin - - * po/nb.po: update for Norwegian Bokmål translation - -2009-03-19 15:16 Thierry Vignaud - - * Makefile, NEWS: 5.11.1 - -2009-03-19 15:16 Thierry Vignaud - - * NEWS, Rpmdrake/open_db.pm: (is_it_a_devel_distro) export it (will - be used by mdkapplet) - -2009-03-19 15:11 Thierry Vignaud - - * Rpmdrake/open_db.pm: make export list more readable - -2009-03-19 14:59 Thierry Vignaud - - * Makefile, NEWS: 5.11 - -2009-03-19 14:53 Thierry Vignaud - - * NEWS, Rpmdrake/open_db.pm: (get_update_medias) use new - is_it_a_devel_distro() in order to update - all media on cooker instead of only update media - -2009-03-19 14:49 Thierry Vignaud - - * Rpmdrake/open_db.pm: (is_it_a_devel_distro) introduce it in order - to check whether the - distro is 'cooker' or not - -2009-03-19 14:49 Thierry Vignaud - - * Rpmdrake/open_db.pm, Rpmdrake/pkg.pm: (get_update_medias) move it - from Rpmdrake::pkgs into Rpmdrake::open_db - where resides get_inactive_backport_media() - (more logical place and will be used by mdkapplet) - -2009-03-19 14:47 Thierry Vignaud - - * MandrivaUpdate, NEWS: (run_treeview_dialog) fix width of title by - workarounding Gtk+ (#48259) - -2009-03-19 14:41 Thierry Vignaud - - * NEWS, Rpmdrake/open_db.pm: (get_inactive_backport_media) do not - try to update & parse inactive sources backports media - -2009-03-19 14:36 Thierry Vignaud - - * MandrivaUpdate: (run_treeview_dialog) force width of icon column - to be fixed - -2009-03-18 19:59 Andrea Celli - - * po/it.po: update translation for Italian - -2009-03-18 17:48 bedi - - * po/pt_BR.po: updating translations for pt_br - -2009-03-18 17:45 bedi - - * po/pt_BR.po: updating translations for pt_br - -2009-03-18 15:29 Thierry Vignaud - - * Makefile, NEWS: 5.10 - -2009-03-18 15:09 Thierry Vignaud - - * MandrivaUpdate, NEWS: (run_treeview_dialog) do not harcode column - id and fix it (in - 'toggled' signal handler too) ; - - this means we got the right cell renderer and thus the 'toggled' - signal handler does be connected ; - - this means we stop ignoring selected/unselected packages - (embarassing - bug #29835) - - (this regression was introduced in r242980 on 2008-06-18: - "(refresh_packages_list, run_treeview_dialog) show type of update - in - mandrivaupdate: fix, security, ... (spec 216)") - -2009-03-18 14:22 Thierry Vignaud - - * MandrivaUpdate: (run_treeview_dialog) simplify through using - MDK::Common - -2009-03-18 14:21 Thierry Vignaud - - * MandrivaUpdate: perl_checker cleanups - -2009-03-18 12:09 olorin - - * po/nb.po: update for Norwegian Bokmål translation - -2009-03-13 14:07 olorin - - * po/nb.po: update for Norwegian Bokmål translation - -2009-03-12 21:59 Сергій Рибалченко (Sergey Ribalchenko) - - * po/uk.po: translation update - -2009-03-09 17:36 bedi - - * po/pt_BR.po: Updated translation for brazilian portuguese - -2009-03-08 22:20 Michal Bukovjan - - * po/cs.po: Updated Czech translation. - -2009-03-08 22:19 atilla - - * po/tr.po: updated translation for turkish language - -2009-03-06 16:32 Ilyas Bakirov - - * po/ky.po: update translation for kirghiz language - -2009-03-05 16:16 Thierry Vignaud - - * po/cy.po: update (Rhoslyn Prys) - -2009-03-05 08:53 Tomasz Bednarski - - * po/pl.po: update translation for Polish - -2009-03-04 18:45 bedi - - * po/pt_BR.po: fixed typo in pt_BR - -2009-03-04 18:36 bedi - - * po/pt_BR.po: Removal of unwanted capslock words for ptBR Language - -2009-03-04 13:35 bedi - - * po/pt_BR.po: Changes to fix rpmdrake potfile for pt_BR - -2009-03-03 19:52 bedi - - * po/pt_BR.po: fixed error in pt_BR translation - -2009-03-03 06:21 Shiva Huang - - * po/zh_TW.po: Update zh_TW translation - -2009-03-03 03:30 bedi - - * po/pt_BR.po: Updated tranlation for brazilian portuguese - -2009-03-02 17:22 bedi - - * po/pt_BR.po: updated for pt_BR translation - -2009-03-01 22:51 atilla - - * po/tr.po: updated translation for turkish language - -2009-03-01 20:10 Inigo Salvador Azurmendi - - * po/eu.po: Osatuta. - -2009-02-28 04:54 dimitrios - - * po/el.po: update translation for greek language - -2009-02-27 19:13 bedi - - * po/pt_BR.po: updated for pt_BR translation - -2009-02-27 19:02 bedi - - * po/pt_BR.po: Updated tranlation for brazilian portuguese - -2009-02-27 06:25 dimitrios - - * po/el.po: update translation for greek language - -2009-02-26 16:09 bedi - - * po/pt_BR.po: ressending rpmdrake potfile - -2009-02-25 17:58 bedi - - * po/pt_BR.po: changed translation line for pt_BR - -2009-02-25 16:53 bedi - - * po/pt_BR.po: fixed fuzzy line for pt_BR - -2009-02-24 02:04 bedi - - * po/pt_BR.po: Updated tranlation for brazilian portuguese - -2009-02-23 18:43 Thierry Vignaud - - * po/pt_BR.po: fix po error that breaks build - -2009-02-23 16:57 Thierry Vignaud - - * NEWS, rpmdrake.pm: use right icon - -2009-02-23 16:55 Thierry Vignaud - - * Makefile, NEWS: 5.9 - -2009-02-23 16:52 Thierry Vignaud - - * gui.lst: further update - -2009-02-23 16:47 Thierry Vignaud - - * NEWS: log latest changes - -2009-02-23 16:36 Thierry Vignaud - - * Rpmdrake/pkg.pm: (get_updates_list,get_pkgs) latest - simplification commit enables to further simplify, thus removing - a useless loop on update media - -2009-02-23 16:27 Thierry Vignaud - - * Rpmdrake/pkg.pm: (get_pkgs) simplify and optimize - -2009-02-23 15:48 Thierry Vignaud - - * Rpmdrake/open_db.pm: (get_inactive_backport_media) do not try to - update & parse inactive debug - backports media (slightly reduce memory usage -- 464kb on current - 2009.0 media config) - -2009-02-23 15:25 Thierry Vignaud - - * Rpmdrake/pkg.pm: (extract_header,get_installed_packages) further - reduce memory usage by not keeping around - descriptions for installed packages ; fetch them on demand - (1.2% of resident memory further saved on std x86_64 media - config) - -2009-02-23 15:22 Thierry Vignaud - - * Rpmdrake/gui.pm, Rpmdrake/pkg.pm: (get_pkgs,get_summary) slightly - reduce memory usage by not keeping around - summaries (2.1% of resident memory saved on std x86_64 media - config) - -2009-02-22 21:03 Reinout van Schouwen - - * po/nl.po: 2009-02-22 Reinout van Schouwen - - - nl.po: Updated Dutch translation - - -2009-02-22 17:47 Yukiko Bando - - * po/ja.po: Japanese translation updated. - -2009-02-21 21:58 cfrussen - - * po/ro.po: Updated Romanian translation - -2009-02-21 21:00 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-20 10:37 Thierry Vignaud - - * NEWS, gui.lst: update GUI package list - -2009-02-20 03:48 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-20 03:16 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-20 03:12 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-19 18:59 bedi - - * po/pt_BR.po: Update for pt_BR Language - -2009-02-18 06:11 atilla - - * po/tr.po: update translation for turkish language - -2009-02-16 21:34 bedi - - * po/pt_BR.po: Update for pt_BR Language - -2009-02-16 21:08 bedi - - * po/pt_BR.po: Update for pt_BR Language - -2009-02-16 16:16 bedi - - * po/pt_BR.po: Update for pt_BR Language - -2009-02-16 15:42 Gergely Lónyai - - * po/hu.po: Hungarian translation update - -2009-02-16 13:44 Thierry Vignaud - - * NEWS, rpmdrake: prevent running more than one instance (#47755) - -2009-02-16 10:41 Marek Laane - - * po/et.po: Updated Estonian translation. - -2009-02-15 09:19 Thierry Vignaud - - * Rpmdrake/edit_urpm_sources.pm: (mainwindow) make more readable - -2009-02-15 09:08 Thierry Vignaud - - * Rpmdrake/pkg.pm: (get_updates_list) split it out of get_pkgs() - -2009-02-15 08:30 Thierry Vignaud - - * NEWS: latest commit closed a bug report btw... - -2009-02-15 08:29 Thierry Vignaud - - * Rpmdrake/pkg.pm: (get_pkgs) enhance previous commit (r252875): - skip even more - computations but do compute updates for MandrivaUpdate - -2009-02-15 08:22 Thierry Vignaud - - * NEWS, Rpmdrake/pkg.pm, rpmdrake: (get_pkgs) add 'compute_updates' - option that enable super fast startup - by skipping computing updates on startup - -2009-02-15 07:36 Jure Repinc - - * po/sl.po: Updated Slovenian translation - -2009-02-15 00:11 Thierry Vignaud - - * Rpmdrake/gui.pm: (do_action) add a FIXME note about offering to - report the problem into bugzilla - -2009-02-14 23:56 Thierry Vignaud - - * NEWS: typo fix - -2009-02-14 23:39 Thierry Vignaud - - * Makefile, NEWS: 5.8 - -2009-02-14 23:37 Thierry Vignaud - - * NEWS, Rpmdrake/edit_urpm_sources.pm, icons/title-media.png: use - same icon as in mcc instead of rpmdarke one (#44671) - -2009-02-14 23:36 Thierry Vignaud - - * NEWS: move bug reference - -2009-02-14 23:35 Thierry Vignaud - - * NEWS: log latest change (update banner icons from mcc ones) - -2009-02-14 23:34 Thierry Vignaud - - * icons/title-install.png, icons/title-update.png: copy icons from - MCC - -2009-02-14 23:32 Thierry Vignaud - - * icons/title-remove.png, rpmdrake-remove: kill rpmdrake-remove - forever (unpackaged for a while) - -2009-02-14 23:27 Thierry Vignaud - - * MandrivaUpdate, NEWS, Rpmdrake/edit_urpm_sources.pm, rpmdrake: - use mcc icon if availlable (#44671) - -2009-02-14 23:25 Thierry Vignaud - - * rpmdrake.pm: (get_icon) introduce it in order to reuse mcc icon - if availlable (#44671) - -2009-02-14 23:15 Thierry Vignaud - - * NEWS, Rpmdrake/edit_urpm_sources.pm: - (easy_add_callback_with_mirror,easy_add_callback) honnor - canceling - when the user closed the "updates/full_sources" dialog (#47125) - -2009-02-14 23:13 Thierry Vignaud - - * rpmdrake.pm: (interactive_msg) document return value - -2009-02-14 23:06 Thierry Vignaud - - * NEWS, rpmdrake.pm: (choose_mirror) honnor canceling when the user - refused to access the - network when adding a specific mirror from the menubar (#46027) - -2009-02-14 16:40 Christophe Berthelé - - * po/fr.po: Update French translation - -2009-02-13 23:40 Thierry Vignaud - - * po/rpmdrake.pot: (toggle_nodes) remove useless end of lines - -2009-02-13 23:39 Thierry Vignaud - - * Rpmdrake/gui.pm, po/af.po, po/am.po, po/ar.po, po/az.po, - po/be.po, po/bg.po, po/bn.po, po/br.po, po/bs.po, po/ca.po, - po/cs.po, po/cy.po, po/da.po, po/de.po, po/el.po, po/eo.po, - po/es.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po, - po/fur.po, po/ga.po, po/gl.po, po/he.po, po/hi.po, po/hr.po, - po/hu.po, po/hy.po, po/id.po, po/is.po, po/it.po, po/ja.po, - po/ka.po, po/ko.po, po/ku.po, po/ky.po, po/lt.po, po/ltg.po, - po/lv.po, po/mk.po, po/mn.po, po/ms.po, po/mt.po, po/nb.po, - po/nl.po, po/nn.po, po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, - po/ro.po, po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, - po/sl.po, po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, - po/tg.po, po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, - po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: - (toggle_nodes) remove useless end of lines - -2009-02-13 23:32 Thierry Vignaud - - * po/af.po, po/am.po, po/ar.po, po/az.po, po/be.po, po/bg.po, - po/bn.po, po/br.po, po/bs.po, po/ca.po, po/cs.po, po/cy.po, - po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, - po/eu.po, po/fa.po, po/fi.po, po/fr.po, po/fur.po, po/ga.po, - po/gl.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/hy.po, - po/id.po, po/is.po, po/it.po, po/ja.po, po/ka.po, po/ko.po, - po/ku.po, po/ky.po, po/lt.po, po/ltg.po, po/lv.po, po/mk.po, - po/mn.po, po/ms.po, po/mt.po, po/nb.po, po/nl.po, po/nn.po, - po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, - po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, po/sl.po, - po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, po/tg.po, - po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, - po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: - sync with code - -2009-02-13 23:26 Thierry Vignaud - - * Rpmdrake/gui.pm: (toggle_nodes) previous commit nicely showed - some duplicated code ; - let's factorize it - -2009-02-13 23:21 Jure Repinc - - * po/sl.po: Updated Slovenian translation - -2009-02-13 23:19 Thierry Vignaud - - * Rpmdrake/gui.pm: (toggle_nodes) add a titles when warning about - conflicting package - -2009-02-13 23:19 Thierry Vignaud - - * Rpmdrake/gui.pm: (toggle_nodes) fix title when asking for - removing additional packages confirmatin - -2009-02-13 23:06 Thierry Vignaud - - * Rpmdrake/pkg.pm: (already_installed_or_not_installable) really do - not show empty - dialogs (r252829 was incomplete) - -2009-02-13 22:53 Thierry Vignaud - - * Rpmdrake/pkg.pm: (perform_installation) try to pass a meaningfull - @ask_unselect to urpm::main_loop::run() - -2009-02-13 22:52 Thierry Vignaud - - * Rpmdrake/pkg.pm: (already_installed_or_not_installable) do not - show empty dialogs - - rationale: due to some bugs in urpmi, we cannot always keep the - state - and thus urpm::select::translate_already_installed() results in - us - displaying empty dialogs sometimes - -2009-02-13 22:40 Thierry Vignaud - - * NEWS, Rpmdrake/pkg.pm: (perform_installation) fix crashing on - uninstalling packages (#47751) - -2009-02-13 15:24 Yukiko Bando - - * po/ja.po: Japanese translation updated. - -2009-02-12 10:30 Thierry Vignaud - - * NEWS, Rpmdrake/edit_urpm_sources.pm: (mainwindow) do not use the - same shortcut for "Add a specific "media - mirror" and "_Add a custom medium" menu entries (#46027) - -2009-02-12 10:24 Thierry Vignaud - - * NEWS: better log - -2009-02-12 10:23 Thierry Vignaud - - * NEWS, Rpmdrake/open_db.pm: (fast_open_urpmi_db) prevent crashing - in URPM when using --env with relative paths - (eg: "unable to read synthesis file - bug-envs/47305_full/rpmdb.cz") - - (I suspect some chdir() happens at a certain stage in urpmi or - URPM) - -2009-02-11 21:29 Andrea Celli - - * po/it.po: update translation for Italian - -2009-02-11 17:48 Thierry Vignaud - - * Makefile, NEWS: 5.7 - -2009-02-11 15:48 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-11 15:37 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-11 15:21 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-11 15:00 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-11 14:55 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-10 17:52 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-10 17:49 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-10 16:46 Thierry Vignaud - - * NEWS, rpmdrake: (run_treeview_dialog) add C-F accelerator in - order to focus on search entry (#46404) - -2009-02-10 14:36 Thierry Vignaud - - * rpmdrake.pm: (update_sources) simplify - -2009-02-10 11:22 Thierry Vignaud - - * NEWS, Rpmdrake/open_db.pm: (fast_open_urpmi_db) fix using - --justdb option - -2009-02-10 10:58 Thierry Vignaud - - * NEWS: fix date - -2009-02-10 10:55 Thierry Vignaud - - * NEWS, Rpmdrake/pkg.pm: (perform_installation) implement - 'need_restart' so that we warn when rebooting - is needed after installing packages - -2009-02-10 06:06 dimitrios - - * po/el.po: update translation for greek language - -2009-02-09 14:25 Thierry Vignaud - - * Makefile, NEWS: 5.6 - -2009-02-09 14:25 Thierry Vignaud - - * gui.lst: further update GUI package list - -2009-02-09 14:19 Thierry Vignaud - - * NEWS, rpmdrake.pm: (update_sources_interactive) fix media - selection dialog layout so that - dialog behaves smoothly on resizing (#47271) - -2009-02-09 14:08 Thierry Vignaud - - * NEWS, Rpmdrake/pkg.pm: (warn_about_media) use new proper API to - select media, thus fixing not - updating media (side effect of urpmi-6.14.12 API changes, #47209) - -2009-02-05 22:21 bedi - - * po/pt_BR.po: update translation for pt_BR language - -2009-02-05 18:28 Marek Laane - - * po/et.po: Modified as requested by Jaanus Ojangu. - -2009-01-31 22:23 Karl Ove Hufthammer - - * po/nn.po: Updated Norwegian Nynorsk translation. - -2009-01-28 12:31 Pavel Maryanov - - * po/ru.po: Russian translation updated - -2009-01-22 15:22 bedi - - * po/pt_BR.po: update translation for pt_BR language - 2008-10-06 19:45 Thierry Vignaud * rpmdrake.pm: (run_as_user) export it for Rpmdrake::gui diff --git a/MandrivaUpdate b/MandrivaUpdate index 4f5f6e69..21678716 100755 --- a/MandrivaUpdate +++ b/MandrivaUpdate @@ -79,8 +79,6 @@ sub refresh_packages_list { if (!$initialized) { $pkgs->{$_}{selected} = 0 foreach @requested; my @selectable = grep { !$pkgs->{$_}{pkg}->flag_skip } @requested; - # adjust boolean to reality of selected state: - toggle($list, @selectable) if @selectable; toggle($list, @selectable) if @selectable; $initialized = 1; } @@ -133,17 +131,6 @@ sub quit() { Gtk2->main_quit; } -sub select_n_refresh { - my ($list, $info, $update_button, $value) = @_; - toggle_all({ - widgets => { - detail_list => $list, - detail_list_model => $list->get_model - }, - }, $value); - refresh_packages_list($list, $info, $update_button); -} - sub run_treeview_dialog { my ($callback_action) = @_; @@ -188,11 +175,15 @@ sub run_treeview_dialog { ), 0, gtksignal_connect( Gtk2::Button->new(but_(N("Select all"))), - clicked => sub { select_n_refresh($list, $info, $update_button, 1) }, - ), - 0, gtksignal_connect( - Gtk2::Button->new(but_(N("Unselect all"))), - clicked => sub { select_n_refresh($list, $info, $update_button, 0) }, + clicked => sub { + toggle_all({ + widgets => { + detail_list => $list, + detail_list_model => $list->get_model + }, + }, 1); + refresh_packages_list($list, $info, $update_button); + }, ), 1, gtknew('Label'), 0, my $action_button = gtksignal_connect( diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 84549813..40334a42 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -374,7 +374,6 @@ sub toggle_all { my @l = children($w) or return; my @unsel = grep_unselected(@l); - # FIXME: ignore unsel according to $_val (val=0 => unselect?, =1 => select?) my @p = @unsel ? #- not all is selected, select all if no option to potentially override (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) @@ -526,7 +525,15 @@ sub pkgs_provider { ); my %tmp_filter_methods = ( all => sub { [ keys %$pkgs ] }, - all_updates => sub { $h->{updates} }, + all_updates => sub { + # potential "updates" from media not tagged as updates: + if (!$options{pure_updates} && !$Rpmdrake::pkg::need_restart) { + [ @{$h->{updates}}, + difference2([ grep { is_updatable($_) } @{$h->{installable}} ], $h->{backports}) ]; + } else { + $h->{updates}; + } + }, backports => sub { $h->{backports} }, meta_pkgs => sub { $h->{meta_pkgs} }, gui_pkgs => sub { $h->{gui_pkgs} }, @@ -636,8 +643,6 @@ sub toggle_nodes { \@nodes, \@nodes_with_deps) or @nodes_with_deps = (); }; - warn ">> old_state=$old_state, new_state=$new_state\n"; - if (member($old_state, qw(to_remove installed))) { # remove pacckages if ($new_state) { my @remove; @@ -729,7 +734,6 @@ sub toggle_nodes { packages_selection_ok: } else { my @unrequested; - warn ">> DESELECTING\n"; slow_func($widget, sub { @unrequested = $urpm->disable_selected(open_rpm_db(), $urpm->{state}, map { $pkgs->{$_}{pkg} } @nodes) }); diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index bc2179ba..3ddca0f8 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -401,15 +401,11 @@ sub get_updates_list { # list updates including skiped ones + their deps in MandrivaUpdate: @$requested_list = uniq(@$requested_list, @$requested_strict); - #use Data::Dumper; die Dumper $urpm->{media}; - # do not pre select updates in rpmdrake: @$requested_strict = () if !$probe_only_for_updates; } sub get_pkgs { - use Benchmark; - my $t0 = new Benchmark; my ($opts) = @_; my $w = $::main_window; @@ -479,27 +475,9 @@ sub get_pkgs { my $state = {}; my (@requested, @requested_strict); - warn ">> $compute_updates || $::MODE eq 'update'\n"; if ($compute_updates || $::MODE eq 'update') { - # faster, ony look at update media for computing updates: - use Data::Dumper; output('/tmp/media.pm', Dumper [ \@update_medias, $urpm->{media} ]); - my $urpm = $urpm; - #my have side effects :-( : - $urpm = open_urpmi_db(update => 1) if !is_it_a_devel_distro(); - #local $urpm->{media} = \@update_medias; # not enough, request_packages_to_upgrade->() will find them anyway due to all packages being known - get_updates_list($urpm, $db, $state, $requested, \@requested, \@requested_strict, \%all_pkgs); } - my $t1 = new Benchmark; - my $td = timediff($t1, $t0); - print "the code took:",timestr($td),"\n"; - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; - warn ">> $compute_updates || $::MODE eq 'update'\n"; - output("/tmp/pkgs_$$.pm", Dumper([ \@requested, \@requested_strict ])); - #DIE "DONE\n"; - $a; - #exit 1; $priority_state = $need_restart ? $state : undef; $priority_requested = $need_restart ? $requested : undef; @@ -534,7 +512,6 @@ sub get_pkgs { } } @updates = @requested; - #warn Dumper [ \@updates, \@requested, \@requested_strict ]; # selecting updates by default but skipped ones (MandrivaUpdate only): foreach (@requested_strict) { $all_pkgs{$_}{selected} = 1; @@ -884,6 +861,7 @@ you may now inspect some in order to take actions:"), } N("RPM transaction %d/%d"); + N("Unselect all"); N("Details"); statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this diff --git a/gui.lst b/gui.lst index a613e35b..b1748a00 100644 --- a/gui.lst +++ b/gui.lst @@ -97,8 +97,6 @@ avidemux-gtk avidemux-qt ayttm babytrans -backintime-gnome -backintime-kde4 bacula-bat bacula-console-gnome bacula-console-wx @@ -310,11 +308,11 @@ ecawave ecell echomixer eclipse-platform -ecryptfs-utils ed2k-gtk-gui edje_editor edje_viewer edyuk +ee efax-gtk egoboo egon @@ -331,6 +329,7 @@ emelfm2 emerald emesene emi +emma empathy emphasis endeavour @@ -456,7 +455,6 @@ ganyremote gapcmon garlic gastman -gaupol gav gazpacho gbrainy @@ -544,7 +542,6 @@ gnokii-xgnokii gnomad2 gnome-alsamixer gnome-blog -gnome-bluetooth gnome-breakout gnome-chess gnome-commander @@ -556,6 +553,7 @@ gnome-device-manager gnome-do gnome-games gnome-hearts +gnome-jabber gnome-kerberos gnome-keyring-manager gnome-lirc-properties @@ -807,7 +805,6 @@ junkie k3b k3d k3dsurf -k9copy kaconnect kaddressbook kadu @@ -869,6 +866,7 @@ kde3-k9copy kde3-kio-sysinfo kde3-kjsembed kde3-kmobiletools +kde4-k9copy kde4-style-bespin kdeaccessibility3 kdeaccessibility3-kttsd @@ -914,7 +912,6 @@ kdegraphics3-kview kdegraphics3-mrmlsearch kdelibs3-common kdelibs4-core -kdelirc kdenetwork3-common kdenetwork3-kdict kdenetwork3-kget @@ -952,7 +949,6 @@ kdesdk-kcachegrind kdesdk-kompare kdesdk-umbrello kdesdk4-scripts -kdesnake kdesvn kdetoys kdetoys-kweather @@ -1109,7 +1105,6 @@ kpsk kradio kradioripper krandr -krb5-auth-dialog krdc krecipes kredentials @@ -1162,7 +1157,6 @@ ktimetracker ktoon ktorrent ktouch -ktron kttsd ktuberling kturtle @@ -1244,7 +1238,6 @@ lumiere luola lxappearance lxcontrol -lxinput lxmusic lxrandr lxsession-edit @@ -1414,6 +1407,7 @@ opengrade openldev openlierox openmortal +openmovieeditor openmsx openoffice.org-base openoffice.org-calc @@ -1496,7 +1490,6 @@ planner plasma-applet-bball plasma-applet-binaryclock plasma-applet-bluemarble -plasma-applet-bubblemon plasma-applet-calculator plasma-applet-calendar plasma-applet-charselect @@ -1515,12 +1508,8 @@ plasma-applet-lastmoid plasma-applet-leavenote plasma-applet-life plasma-applet-luna -plasma-applet-magnifique -plasma-applet-mediaplayer -plasma-applet-microblog plasma-applet-news plasma-applet-nowplaying -plasma-applet-opendesktop plasma-applet-panelspacer plasma-applet-paste plasma-applet-pastebin @@ -1532,18 +1521,14 @@ plasma-applet-quicklauncher plasma-applet-raptor plasma-applet-rsibreak plasma-applet-rssnow -plasma-applet-rtm plasma-applet-showdashboard plasma-applet-showdesktop -plasma-applet-stasks plasma-applet-system-monitor-cpu plasma-applet-system-monitor-hdd plasma-applet-system-monitor-hwinfo plasma-applet-system-monitor-net plasma-applet-system-monitor-temperature -plasma-applet-systemloadviewer plasma-applet-timer -plasma-applet-unitconverter plasma-applet-weather plasma-applet-weatherstation plasma-applet-webbrowser @@ -1555,7 +1540,6 @@ poker-network pokerth policycoreutils-gui policykit-gnome -policykit-kde polyxmass ponyprog2000 popfile @@ -1853,7 +1837,7 @@ tomboy toppler torcs tork -totem +totem-common tovid tpad trackballs @@ -2006,7 +1990,6 @@ xemacs xfbib xfburn xfce4-appfinder -xfce4-clipman-plugin xfce4-dict xfce4-mixer xfce4-notifyd diff --git a/rpmdrake b/rpmdrake index c2c4aac0..0652d171 100755 --- a/rpmdrake +++ b/rpmdrake @@ -53,14 +53,6 @@ our $statusbar; my %elems; -my ($results_ok, $results_none) = (N("Search results"), N("Search results (none)")); - -sub clear_search { - my ($options) = @_; - $options->{delete_category}->($_) foreach $results_ok, $results_none; - $options->{state}{flat} and $options->{delete_all}->(); -} - sub do_search($$$$$$$) { my ($find_entry, $tree, $tree_model, $options, $current_search_type, $urpm, $pkgs) = @_; my $entry = $find_entry->get_text or return; @@ -71,7 +63,9 @@ sub do_search($$$$$$$) { $entry =~ s/^\s*$//; } my $entry_rx = eval { qr/$entry/i } or return; - clear_search($options); + my ($results_ok, $results_none) = (N("Search results"), N("Search results (none)")); + $options->{delete_category}->($_) foreach $results_ok, $results_none; + $options->{state}{flat} and $options->{delete_all}->(); $tree->collapse_all; my @search_results; if ($current_search_type eq 'normal') { @@ -661,13 +655,7 @@ sub run_treeview_dialog { 'icon-press' => sub { my (undef, $pos, $event) = @_; # emulate Sexy::IconEntry's clear_button: - if ($pos eq 'secondary') { - $find_entry->set_text(''); - clear_search($options); - # clear package list: - #$options->{add_nodes}->(); IF search_ok|none SELECTED - - } + $find_entry->set_text('') if $pos eq 'secondary'; return if $pos ne 'primary'; $search_menu->popup(undef, undef, undef, undef, $event->button, $event->time); }, -- cgit v1.2.1