Hello community, here is the log from the commit of package yast2-installation checked in at Fri Nov 28 16:12:19 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-11-28 12:04:52.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2008-11-28 12:16:49.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 28 12:16:03 CET 2008 - locilka@suse.cz + +- Fixed behavior of inst_new_desktop when user switched to another + language later (bnc #449818). +- 2.17.42 + +------------------------------------------------------------------- +Thu Nov 27 16:49:11 CET 2008 - locilka@suse.cz + +- Using yast-live-install-finish icon when finishing LiveCD + installation/inst_finish (bnc #438154). +- Fixed ImageInstallation SlideShow - download progress is shown + only when downloading the images, not the other helper files + (bnc #449792). +- Adjusting ImageInstallation-related SlideShow only if + ImageInstallation is in use (bnc #439104). + +------------------------------------------------------------------- @@ -4 +22 @@ -- the real fix for bnc #442691 +- the real fix for #442691 calling whatdependson for head-i586 Old: ---- yast2-installation-2.17.41.tar.bz2 New: ---- yast2-installation-2.17.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.vv9602/_old 2008-11-28 16:10:58.000000000 +0100 +++ /var/tmp/diff_new_pack.vv9602/_new 2008-11-28 16:10:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.17.41) +# spec file for package yast2-installation (Version 2.17.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.17.41 +Version: 2.17.42 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.17.41.tar.bz2 +Source0: yast2-installation-2.17.42.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -45,8 +45,8 @@ Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() Conflicts: yast2-pkg-bindings < 2.17.25 -# ProductLicense::AcceptanceNeeded, BNC #448598 -Requires: yast2-packager >= 2.17.46 +# BNC #449818: "description_id" in DefaultDesktop +Requires: yast2-packager >= 2.17.49 # Storage::GetCommitInfo() call in include/misc.ycp Requires: yast2-storage >= 2.17.47 # Only in inst-sys @@ -120,7 +120,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.17.41 +%setup -n yast2-installation-2.17.42 %build %{prefix}/bin/y2tool y2autoconf @@ -189,8 +189,20 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Fri Nov 28 2008 locilka@suse.cz +- Fixed behavior of inst_new_desktop when user switched to another + language later (bnc #449818). +- 2.17.42 +* Thu Nov 27 2008 locilka@suse.cz +- Using yast-live-install-finish icon when finishing LiveCD + installation/inst_finish (bnc #438154). +- Fixed ImageInstallation SlideShow - download progress is shown + only when downloading the images, not the other helper files + (bnc #449792). +- Adjusting ImageInstallation-related SlideShow only if + ImageInstallation is in use (bnc #439104). * Thu Nov 27 2008 ug@suse.de -- the real fix for bnc #442691 +- the real fix for #442691 deploy_image_auto doesn't use the boolean variable image_installation - 2.17.41 ++++++ yast2-installation-2.17.41.tar.bz2 -> yast2-installation-2.17.42.tar.bz2 ++++++ ++++ 3300 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/configure.in new/yast2-installation-2.17.42/configure.in --- old/yast2-installation-2.17.41/configure.in 2008-11-27 15:13:18.000000000 +0100 +++ new/yast2-installation-2.17.42/configure.in 2008-11-25 16:33:54.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.17.41, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.17.40, http://bugs.opensuse.org/, yast2-installation) 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.17.41" +VERSION="2.17.40" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.42/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.17.41/src/clients/inst_complex_welcome.ycp 2008-11-25 17:09:35.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_complex_welcome.ycp 2008-11-25 16:57:09.000000000 +0100 @@ -218,7 +218,12 @@ void ReadCurrentUIState () { language = (string) UI::QueryWidget (`id (`language), `Value); keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); - license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); + + if (ProductLicense::AcceptanceNeeded()) { + license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value); + } else { + license_acc = true; + } } // Returns true if the dialog needs redrawing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/clients/inst_deploy_image.ycp new/yast2-installation-2.17.42/src/clients/inst_deploy_image.ycp --- old/yast2-installation-2.17.41/src/clients/inst_deploy_image.ycp 2008-11-13 14:59:38.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_deploy_image.ycp 2008-11-27 16:59:08.000000000 +0100 @@ -62,7 +62,7 @@ // div by zero! if (_current_subprogress_total == 0) { y2error ("steps_total=0"); - _current_subprogress_total = 100; + _current_subprogress_total = 1; } y2milestone ( @@ -91,6 +91,7 @@ SetProgress(); } + // Should be 0 - 100% _current_overall_progress = _current_subprogress_start + (_current_subprogress_steps * _current_step_in_subprogress / _current_subprogress_total); @@ -104,10 +105,38 @@ integer _steps_for_one_image = 100; boolean download_handler_hit = false; string _last_image_downloading = nil; +boolean report_image_downloading = false; + +// Not only images but also some helper files are downloaded +// Image installation should report only images +// BNC #449792 +void MyStartDownloadHandler (string url, string localfile) { + map <string, any> current_image = ImageInstallation::GetCurrentImageDetails(); + string current_image_file = current_image["file"]:""; + + // Fetches is (additionally) downloading some other file + if (current_image_file == nil || current_image_file == "") { + y2warning ("Uknown image being downloaded: %1", current_image); + report_image_downloading = false; + return; + } + + integer image_filename_length = size (current_image_file); + // 'http://some.url/directory/image.name' vs. 'directory/image.name' + string image_url_download = substring (url, size (url) - image_filename_length, image_filename_length); + + // downloading progress is reported only if + report_image_downloading = (image_url_download == current_image_file); + + y2milestone ("Downloading started %1, showing progress %2", url, report_image_downloading); +} boolean MyProgressDownloadHandler (integer percent, integer bps_avg, integer bps_current) { // changing settings on the fly // ... first when download handler is hit + // + // if a repository is remote, there are twice more steps to do (download, deploy) + // local (or NFS, SMB, ...) access do not use downloader if (! download_handler_hit) { y2milestone ("DownloadHandler - first hit"); // twice more steps @@ -115,6 +144,12 @@ download_handler_hit = true; } + // See MyStartDownloadHandler + // BNC #449792 + if (report_image_downloading != true) { + return true; + } + map <string, any> current_image = ImageInstallation::GetCurrentImageDetails(); if (_last_download_progress < percent) { @@ -127,6 +162,7 @@ _last_image_downloading = image_info; } + // unknown image if (image_info == "") { image_info = sformat (_("Downloading image at speed %1/s"), String::FormatSize (bps_current)); } else { @@ -223,6 +259,7 @@ ImageInstallation::SetDeployTarImageProgress (SetOneImageProgress); ImageInstallation::SetDownloadTarImageProgress (MyProgressDownloadHandler); +ImageInstallation::SetStartDownloadImageProgress (MyStartDownloadHandler); ImageInstallation::SetOverallDeployingProgress (OverallProgressHandler); ImageInstallation::AdjustProgressLayout ("deploying_images", (_steps_for_one_image * size (images)), _("Deploying Images...")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/clients/inst_finish.ycp new/yast2-installation-2.17.42/src/clients/inst_finish.ycp --- old/yast2-installation-2.17.41/src/clients/inst_finish.ycp 2008-10-27 17:08:56.000000000 +0100 +++ new/yast2-installation-2.17.42/src/clients/inst_finish.ycp 2008-11-27 17:00:04.000000000 +0100 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin@suse.de> * Jiri Srain <jsrain@suse.de> * - * $Id: inst_finish.ycp 52601 2008-10-27 15:24:59Z locilka $ + * $Id: inst_finish.ycp 53663 2008-11-27 16:00:48Z locilka $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -149,7 +149,8 @@ "copy_logs", "umount", ], - "icon" : "yast-scripts", + // bnc #438154 + "icon" : (Mode::live_installation() ? "yast-live-install-finish":"yast-scripts"), ], ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/clients/inst_new_desktop.ycp new/yast2-installation-2.17.42/src/clients/inst_new_desktop.ycp --- old/yast2-installation-2.17.41/src/clients/inst_new_desktop.ycp 2008-10-09 12:16:30.000000000 +0200 +++ new/yast2-installation-2.17.42/src/clients/inst_new_desktop.ycp 2008-11-28 11:05:25.000000000 +0100 @@ -120,13 +120,15 @@ `Left (`RadioButton ( `id (GetDesktopRadioButtonId (desktop_name)), radio_opt, - all_desktops[desktop_name,"label"]:"" + // BNC #449818 + ProductControl::GetTranslatedText (all_desktops[desktop_name,"label_id"]:"") )), (desktops == "major" && show_descr ? `ReplacePoint (`id (GetDesktopDescriptionId (desktop_name)), `HBox ( `HSpacing ((text_mode ? 4:2)), - `Left (`Label (all_desktops[desktop_name,"description"]:"")), + // BNC #449818 + `Left (`Label (ProductControl::GetTranslatedText (all_desktops[desktop_name,"description_id"]:""))), `HSpacing (1) )) : diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/clients/inst_prepareprogress.ycp new/yast2-installation-2.17.42/src/clients/inst_prepareprogress.ycp --- old/yast2-installation-2.17.41/src/clients/inst_prepareprogress.ycp 2008-09-11 11:49:51.000000000 +0200 +++ new/yast2-installation-2.17.42/src/clients/inst_prepareprogress.ycp 2008-11-26 18:40:30.000000000 +0100 @@ -27,7 +27,11 @@ SlideShow::OpenDialog(); PackageSlideShow::InitPkgData(true); // FIXME: this is odd! - ImageInstallation::FillUpImagesDetails(); + // Details (such as images sizes) have to known before initializing the SlideShow + // but only if Installation from Images is in use + if (Installation::image_installation) { + ImageInstallation::FillUpImagesDetails(); + } list< map<string,any> > stages = [ $[ @@ -39,7 +43,9 @@ $[ "name" : "images", "description": _("Deploying Images..."), - "value" : ImageInstallation::TotalSize() / 1024, // kilobytes + // Use 'zero' if image installation is not used + // BNC #439104 + "value" : (Installation::image_installation ? ImageInstallation::TotalSize() / 1024 : 0), // kilobytes "units" : `kb, ], $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/src/modules/ImageInstallation.ycp new/yast2-installation-2.17.42/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.17.41/src/modules/ImageInstallation.ycp 2008-11-11 11:04:43.000000000 +0100 +++ new/yast2-installation-2.17.42/src/modules/ImageInstallation.ycp 2008-11-27 16:53:06.000000000 +0100 @@ -28,6 +28,7 @@ import "SlideShow"; import "ProductControl"; import "ProductFeatures"; +import "Packages"; textdomain "installation"; @@ -37,6 +38,25 @@ integer _repo = nil; /** + * Set the repository to get images from + * @param repo integer the repository identification + */ +global void SetRepo (integer repo) { + _repo = repo; + y2milestone ("New images repo: %1", _repo); +} + +/** + * Adjusts the repository for images + */ +void InitRepo () { + if (_repo != nil) + return; + + SetRepo (Packages::theSources[0]:0); +} + +/** * Description of all available images */ map<string,map<string,any> > _images = $[]; @@ -104,14 +124,6 @@ } /** - * Set the repository to get images from - * @param repo integer the repository identification - */ -global void SetRepo (integer repo) { - _repo = repo; -} - -/** * Name of image containing software management metadata (if exists) * @return string image with sw mgmt metadata */ @@ -190,6 +202,14 @@ y2milestone ("New download_image_progress: %1", download_image_progress); } +void (string, string) start_download_handler = nil; + +// BNC #449792 +global void SetStartDownloadImageProgress (void (string, string) sdi) { + start_download_handler = sdi; + y2milestone ("New start_download_handler: %1", start_download_handler); +} + void (string, integer) generic_set_progress = nil; global void SetOverallDeployingProgress (void (string, integer) odp) { @@ -204,6 +224,8 @@ * @return boolean true on success */ boolean DeployTarImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Untarring image %1 (%2) to %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -306,6 +328,8 @@ * @return boolean true on success */ boolean DeployFsImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Deploying FS image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -359,6 +383,8 @@ * @return boolean true on success */ boolean MountFsImage (string id, string target) { + InitRepo(); + string file = _images[id, "file"]:""; y2milestone ("Mounting image %1 (%2) on %3", id, file, target); file = sformat ("%1/%2", _image_path, file); @@ -390,7 +416,9 @@ y2milestone( "Computing total images size from [%1], data %2", _image_order, images_details ); foreach( string image, _image_order, { - sum = sum + images_details[image,"size"]:0; + // 128 MB as a fallback size + // otherwise progress would not move at all + sum = sum + images_details[image,"size"]:134217728; }); y2milestone( "Total images size: %1", sum ); @@ -493,6 +521,14 @@ * Loads non-mandatory details for every single selected image. */ global boolean FillUpImagesDetails () { + InitRepo(); + + // bnc #439104 + if (_repo == nil) { + y2warning ("No images-repository defined"); + return true; + } + // ppc (covers also ppc64), i386, x86_64 ... string filename = nil; @@ -507,7 +543,7 @@ filename = Pkg::SourceProvideDigestedFile (_repo, 1, try_file, true); if (filename != nil && filename != "") { - y2milestone ("Using file: %1 (%2)", filename, try_file); + y2milestone ("Using details file: %1 (%2)", filename, try_file); break; } }); @@ -566,6 +602,10 @@ if (download_image_progress != nil) Pkg::CallbackProgressDownload (download_image_progress); + // register own callback for start downloading + if (start_download_handler != nil) + Pkg::CallbackStartDownload (start_download_handler); + integer num = -1; _current_image_from_imageset = -1; boolean aborted = nil; @@ -632,6 +672,8 @@ * @return boolean true on success or when media does not contain any images */ global boolean FindImageSet (list<string> patterns) { + InitRepo(); + // reset all data _images = $[]; _image_order = []; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.41/VERSION new/yast2-installation-2.17.42/VERSION --- old/yast2-installation-2.17.41/VERSION 2008-11-27 15:13:14.000000000 +0100 +++ new/yast2-installation-2.17.42/VERSION 2008-11-28 12:16:55.000000000 +0100 @@ -1 +1 @@ -2.17.41 +2.17.42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org