Hello community, here is the log from the commit of package yast2-packager checked in at Thu Mar 27 23:36:11 CET 2008. -------- --- yast2-packager/yast2-packager.changes 2008-03-22 11:32:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-03-26 15:24:21.957253000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 26 08:16:48 CET 2008 - lslezak@suse.cz + +- media check - updated and improved help text (bnc#132881) +- repositories - URL can be selected and copied (bnc#334757) +- repositories - added URL column into the table (bnc#335880) +- 2.16.28 + +------------------------------------------------------------------- @@ -156,0 +165 @@ +>>>>>>> .r45460 Old: ---- yast2-packager-2.16.26.tar.bz2 New: ---- yast2-packager-2.16.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.VW9617/_old 2008-03-27 23:33:08.000000000 +0100 +++ /var/tmp/diff_new_pack.VW9617/_new 2008-03-27 23:33:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.16.26) +# spec file for package yast2-packager (Version 2.16.28) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-packager -Version: 2.16.26 -Release: 7 +Version: 2.16.28 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.16.26.tar.bz2 +Source0: yast2-packager-2.16.28.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # enhanced String::FormatRateMessage() @@ -70,7 +70,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.16.26 +%setup -n yast2-packager-2.16.28 %build %{prefix}/bin/y2tool y2autoconf @@ -105,8 +105,12 @@ /usr/share/YaST2/scrconf/* %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager - %changelog +* Wed Mar 26 2008 lslezak@suse.cz +- media check - updated and improved help text (bnc#132881) +- repositories - URL can be selected and copied (bnc#334757) +- repositories - added URL column into the table (bnc#335880) +- 2.16.28 * Fri Mar 21 2008 lslezak@suse.cz - media change callback - autoretry downloading after timeout (3 attempts, 30 seconds each) (bnc#328822) @@ -190,6 +194,7 @@ - Unified DefaultDesktop module and software/desktop selection dialog in installation. - 2.16.17 + >>>>>>> .r45460 * Sun Jan 27 2008 coolo@suse.de - fixing changelog order * Fri Jan 25 2008 lslezak@suse.cz ++++++ yast2-packager-2.16.26.tar.bz2 -> yast2-packager-2.16.28.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/configure new/yast2-packager-2.16.28/configure --- old/yast2-packager-2.16.26/configure 2008-03-21 17:56:19.000000000 +0100 +++ new/yast2-packager-2.16.28/configure 2008-03-26 15:23:28.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.26. +# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.28. # # Report bugs to http://bugs.opensuse.org/. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.16.26' -PACKAGE_STRING='yast2-packager 2.16.26' +PACKAGE_VERSION='2.16.28' +PACKAGE_STRING='yast2-packager 2.16.28' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures yast2-packager 2.16.26 to adapt to many kinds of systems. +`configure' configures yast2-packager 2.16.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.16.26:";; + short | recursive ) echo "Configuration of yast2-packager 2.16.28:";; esac cat <<_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-packager configure 2.16.26 +yast2-packager configure 2.16.28 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.16.26, which was +It was created by yast2-packager $as_me 2.16.28, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.16.26' + VERSION='2.16.28' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.26" +VERSION="2.16.28" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.16.26, which was +This file was extended by yast2-packager $as_me 2.16.28, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -yast2-packager config.status 2.16.26 +yast2-packager config.status 2.16.28 configured by $0, generated by GNU Autoconf 2.61, with options \"`echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/configure.in new/yast2-packager-2.16.28/configure.in --- old/yast2-packager-2.16.26/configure.in 2008-03-21 17:56:15.000000000 +0100 +++ new/yast2-packager-2.16.28/configure.in 2008-03-26 15:23:24.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.16.26, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.16.28, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.26" +VERSION="2.16.28" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/src/clients/repositories.ycp new/yast2-packager-2.16.28/src/clients/repositories.ycp --- old/yast2-packager-2.16.26/src/clients/repositories.ycp 2008-03-21 17:28:45.000000000 +0100 +++ new/yast2-packager-2.16.28/src/clients/repositories.ycp 2008-03-26 15:23:16.000000000 +0100 @@ -7,7 +7,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: repositories.ycp 45463 2008-03-14 14:00:04Z lslezak $ + * $Id: repositories.ycp 45746 2008-03-26 14:23:15Z lslezak $ * */ @@ -21,11 +21,9 @@ import "PackageLock"; import "PackageSystem"; import "Report"; - import "Stage"; // SourceManager overlaps quite a bit with inst_source, // so far we only use it for ZMD sync, TODO refactor better import "SourceManager"; - import "SuSEFirewall"; import "Wizard"; import "Label"; @@ -33,17 +31,17 @@ import "AddOnProduct"; import "Sequencer"; import "CommandLine"; - // constructor of Product is needed in order to initialize the product - // macro. Takes a lot of time because whole package manager target - // is initialized - import "Product"; import "Progress"; + import "Directory"; + import "URL"; include "packager/inst_source_dialogs.ycp"; include "packager/key_manager_dialogs.ycp"; boolean full_mode = false; + boolean textmode = UI::GetDisplayInfo()["TextMode"]:false; + integer numSources = 0; list<map<string,any> > sourceStatesIn = []; @@ -122,10 +120,9 @@ `id( index ), // corresponds to the "Enable/Disable" button source[ "enabled" ]:true ? UI::Glyph (`CheckMark) : "", -// source["autorefresh"]:true ? _("On") : _("Off"), // translators: unknown name for a given source - alias -// generalData[ "url" ]:"" + alias, + generalData[ "url" ]:"" ); return item; } @@ -173,15 +170,33 @@ UI::ChangeWidget( `id( `table ), `Items, items ); } - term repoInfoTerm(string name, string url, string category) { - term infoTerm = - `VBox ( - `Left (`Heading ( name ) ), - `Left (`Label ( url ) ), - `Left (`Label ( category ) ) - ); + string repoInfoRichText(string name, string raw_url, string category) + { + string schema = tolower(URL::Parse(raw_url)["scheme"]:""); + string icon_tag = "<IMG SRC="" + Directory::themedir + "/current/icons/22x22/apps/" + + ((schema == "cd" || schema == "dvd" || schema == "iso") ? "yast-cd_update.png" : "yast-http-server.png") + + ""> "; + + if (raw_url == "") + { + raw_url = _("Unknown"); + } + + string url = sformat (_("URL: %1"), raw_url); - return infoTerm; + return sformat("<P>%1<B><BIG>%2</BIG></B></P><P>%3</P><P>%4</P>", icon_tag, name, url, category); + } + + term repoInfoTerm(string name, string url, string category) + { + return textmode ? + `VBox ( + `Left(`Heading(`id(`name), `opt(`hstretch), name)), + `Left(`Label(`id(`url), `opt(`hstretch), url)), + `Left(`Label(`id(`category), `opt(`hstretch), category )) + ) + : + `VSquash(`RichText(`id(`repo_info), "")); } void fillRepoInfo(integer index, map source) { @@ -195,8 +210,18 @@ // label, %1 is repo category (eg. YUM) string category = sformat (_("Category: %1"), info["type"]:_("Unknown")); - - UI::ReplaceWidget (`id (`repo_rp), repoInfoTerm( name, url, category ) ); + + if (textmode) + { + UI::ChangeWidget(`id(`name), `Label, name); + UI::ChangeWidget(`id(`url), `Label, url); + UI::ChangeWidget(`id(`category), `Label, category); + } + else + { + UI::ChangeWidget(`id(`repo_info), `Value, repoInfoRichText(name, info["url"]:"", category)); + } + UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true); UI::ChangeWidget (`id (`autorefresh), `Value, info["autorefresh"]:true); } @@ -552,11 +577,9 @@ // table header `header( _("Enabled"), // table header -// _("Refresh"), - // table header - _("Name")), + _("Name"), // table header -// _("URL") ), + _("URL") ), items ), `HSpacing() ), @@ -566,9 +589,7 @@ `HBox ( `HSpacing (1), `HWeight( 1, `VBox ( - `ReplacePoint (`id (`repo_rp), - repoInfoTerm( "", "", "" )), - `VSpacing (0.4), + repoInfoTerm("", "", ""), // label `Left (`Label (_("Properties"))), // check box @@ -938,66 +959,9 @@ { state = !state; } - // corresponds to the "Enable/Disable" button -// string newstate = ( state ? _("On") : _("Off") ); -// UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); sourceState["autorefresh"] = state; sourceStatesOut[ current ] = sourceState; } -/* moved to source edit dialog - else if (input == `set_alias) - { - string src_alias = sourceState["name"]:""; - - y2internal("Current alias: %1", src_alias); - - UI::OpenDialog( - `MarginBox(0.4, 0.2, - `VBox( - `HSpacing(40), - // label - text entry - `TextEntry(`id(`alias), `opt(`hstretch), _("Name of the Repository"), src_alias), - `HBox( - `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton()) - ) - ) - ) - ); - - symbol ret = nil; - - do - { - ret = (symbol)UI::UserInput(); - src_alias = (string)UI::QueryWidget(`id(`alias), `Value); - - if (ret == `ok && (src_alias == nil || src_alias == "")) - { - // error popup - Report::Error(_("The name of the repository cannot be empty.")); - ret = `again; - } - } - while (ret != `ok && ret != `cancel && ret != `close); - - - UI::CloseDialog(); - - if (ret == `ok) - { - y2internal("New alias: %1", src_alias); - - // refresh value in the table - UI::ChangeWidget( `id( `table ), `Item( current, 2 ), src_alias ); - - // remember the alias - sourceState["name"] = src_alias; - sourceStatesOut[ current ] = sourceState; - } - } -*/ } } until ( exit ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/src/include/checkmedia/ui.ycp new/yast2-packager-2.16.28/src/include/checkmedia/ui.ycp --- old/yast2-packager-2.16.26/src/include/checkmedia/ui.ycp 2008-02-15 14:36:34.000000000 +0100 +++ new/yast2-packager-2.16.28/src/include/checkmedia/ui.ycp 2008-03-26 08:37:50.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <lslezak@suse.cz> * - * $Id: ui.ycp 44518 2008-02-15 13:36:34Z lslezak $ + * $Id: ui.ycp 45711 2008-03-26 07:37:48Z lslezak $ * * All user interface functions. * @@ -273,36 +273,37 @@ // dialog header string caption = _("Media Check"); - // help text - media check (header) 1/7 + // help text - media check (header) 1/8 string help = _("<P><B>Media Check</B></P>") + - // help text - media check 2/7 + // help text - media check 2/8 _("<P>When you have a problem with the installation and are using a CD or DVD installation medium, you should check whether the medium is broken.</P> ") + - // help text - media check 3/7 -_("<P>Select a drive, insert a medium into the drive or press <B>Start Check</B> + // help text - media check 3/8 +_("<P>Select a drive, insert a medium into the drive and press <B>Start Check</B> or use <B>Check ISO File</B> and select an ISO file. The check can take several minutes depending on speed of the drive and size of the medium. The check verifies the MD5 checksum.</P> ") + - // help text - media check 4/7 + // help text - media check 4/8 _("<P>If the check of the medium fails, you should not continue the installation. It may fail or you may lose your data. You should replace the broken medium.</P> ") + - // help text - media check 5/7 + // help text - media check 5/8 _("After the check you can insert the next medium and start the procedure again. The order of the media is irrelevant.") + - // help text - media check 6/7 -_("<P><B>Note:</B> You cannot change the medium while it is used by the system. If -it happens during installation, start the manual installation and select the media verification item in the menu.</P> -") + + // help text - media check 6/8 +_("<P><B>Note:</B> You cannot change the medium while it is used by the system.</P>") + + + // help text - media check 7/8 +_("<P>To check media before starting installation use the media check item in the boot menu.</P>") + - // help text - media check 7/6 + // help text - media check 8/8 _("<P>If you burn the media yourself, use the <B>pad</B> option in your recording software. It avoids read errors at the end of media during the check.</P> "); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/src/modules/SourceDialogs.ycp new/yast2-packager-2.16.28/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.16.26/src/modules/SourceDialogs.ycp 2008-03-20 14:09:27.000000000 +0100 +++ new/yast2-packager-2.16.28/src/modules/SourceDialogs.ycp 2008-03-26 11:12:51.000000000 +0100 @@ -403,7 +403,7 @@ void NFSInit (string key) { // check the current edit type symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); - y2internal("Current edit type: %1", current_type); + y2debug("Current edit type: %1", current_type); UI::ReplaceWidget(`id(`edit_content), (current_type == `edit_url_parts) ? nfs_details_content : nfs_complete_content); @@ -1259,10 +1259,10 @@ * @return always nil */ symbol ServerHandle (string key, map event) { - y2internal("ServerHandle: %1, %2", key, event); + y2milestone("ServerHandle: %1, %2", key, event); symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); - y2internal("Current edit type: %1", current_type); + y2debug("Current edit type: %1", current_type); any id = event["ID"]:nil; if (is (id, symbol) @@ -1379,12 +1379,10 @@ // check the current edit type symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); - y2internal("Current edit type: %1", current_type); + y2debug("Current edit type: %1", current_type); UI::ReplaceWidget(`id(`edit_content), (current_type == `edit_url_parts) ? details_content : complete_content); - y2internal("UI replaced"); - if (current_type == `edit_url_parts) { term protocol_box = `HBox ( @@ -1483,7 +1481,7 @@ boolean ServerValidate (string key, map event) { symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); - y2internal("Current edit type: %1", current_type); + y2debug("Current edit type: %1", current_type); if (current_type == `edit_url_parts) { @@ -1511,7 +1509,7 @@ y2debug("Server store: %1, %2", key, event); symbol current_type = (symbol)UI::QueryWidget(`id(`edit_type), `Value); - y2internal("Current edit type: %1", current_type); + y2debug("Current edit type: %1", current_type); if (current_type == `edit_url_parts) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/src/modules/test_mediaChange.ycp new/yast2-packager-2.16.28/src/modules/test_mediaChange.ycp --- old/yast2-packager-2.16.26/src/modules/test_mediaChange.ycp 2008-03-21 17:21:00.000000000 +0100 +++ new/yast2-packager-2.16.28/src/modules/test_mediaChange.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -{ - import "PackageCallbacks"; - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "dvd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "dvd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "dvd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "dvd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "dvd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "cd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - - PackageCallbacks::MediaChange ("IO_SOFT", "Failed to mount dvd:/// on /var/adm/mount/AP_0x0000000f: No medium found (mount: No medium found)", "cd:///", "", 0, "", 1, "", false, ["/dev/sr0"], 0); - -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/src/modules/testUI.ycp new/yast2-packager-2.16.28/src/modules/testUI.ycp --- old/yast2-packager-2.16.26/src/modules/testUI.ycp 2008-03-11 10:39:13.000000000 +0100 +++ new/yast2-packager-2.16.28/src/modules/testUI.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -{ - y2internal("UI: %1", UI::GetDisplayInfo()); -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.26/VERSION new/yast2-packager-2.16.28/VERSION --- old/yast2-packager-2.16.26/VERSION 2008-03-14 14:54:46.000000000 +0100 +++ new/yast2-packager-2.16.28/VERSION 2008-03-26 15:22:43.000000000 +0100 @@ -1 +1 @@ -2.16.26 +2.16.28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org