commit yast2-dirinstall

Hello community, here is the log from the commit of package yast2-dirinstall checked in at Mon Apr 21 03:06:32 CEST 2008. -------- --- yast2-dirinstall/yast2-dirinstall.changes 2008-04-11 16:02:17.000000000 +0200 +++ yast2-dirinstall/yast2-dirinstall.changes 2008-04-18 09:42:55.891108000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 18 08:52:12 CEST 2008 - lslezak@suse.cz + +- do not create a copy of the installation source +- select a product for installation - preselect dependent patterns +- do not store the config when abort is pressed +- code clean up (bnc#379154) +- 2.16.2 + +------------------------------------------------------------------- Old: ---- yast2-dirinstall-2.16.1.tar.bz2 New: ---- yast2-dirinstall-2.16.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dirinstall.spec ++++++ --- /var/tmp/diff_new_pack.l12595/_old 2008-04-21 03:01:46.000000000 +0200 +++ /var/tmp/diff_new_pack.l12595/_new 2008-04-21 03:01:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dirinstall (Version 2.16.1) +# spec file for package yast2-dirinstall (Version 2.16.2) # # 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-dirinstall -Version: 2.16.1 +Version: 2.16.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dirinstall-2.16.1.tar.bz2 +Source0: yast2-dirinstall-2.16.2.tar.bz2 Prefix: /usr # Installation::dirinstall_target Requires: yast2 >= 2.16.7 @@ -45,7 +45,7 @@ Ladislav Slezak %prep -%setup -n yast2-dirinstall-2.16.1 +%setup -n yast2-dirinstall-2.16.2 %build %{prefix}/bin/y2tool y2autoconf @@ -79,6 +79,12 @@ /usr/share/YaST2/control/*.xml %doc %{prefix}/share/doc/packages/yast2-dirinstall %changelog +* Fri Apr 18 2008 lslezak@suse.cz +- do not create a copy of the installation source +- select a product for installation - preselect dependent patterns +- do not store the config when abort is pressed +- code clean up (bnc#379154) +- 2.16.2 * Fri Apr 11 2008 jsrain@suse.cz - added possiblity to load software selection from AutoYaST profile (fate #302501) ++++++ yast2-dirinstall-2.16.1.tar.bz2 -> yast2-dirinstall-2.16.2.tar.bz2 ++++++ ++++ 1784 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-dirinstall-2.16.1/configure.in new/yast2-dirinstall-2.16.2/configure.in --- old/yast2-dirinstall-2.16.1/configure.in 2008-04-11 16:00:04.000000000 +0200 +++ new/yast2-dirinstall-2.16.2/configure.in 2008-04-18 09:38:23.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dirinstall dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dirinstall, 2.16.1, http://bugs.opensuse.org/, yast2-dirinstall) +AC_INIT(yast2-dirinstall, 2.16.2, http://bugs.opensuse.org/, yast2-dirinstall) 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.1" +VERSION="2.16.2" RPMNAME="yast2-dirinstall" MAINTAINER="Ladislav Slezak " 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-dirinstall-2.16.1/src/clients/dirinstall.ycp new/yast2-dirinstall-2.16.2/src/clients/dirinstall.ycp --- old/yast2-dirinstall-2.16.1/src/clients/dirinstall.ycp 2008-04-11 14:17:16.000000000 +0200 +++ new/yast2-dirinstall-2.16.2/src/clients/dirinstall.ycp 2008-04-18 09:38:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation into a directory * Authors: Anas Nashif * - * $Id: dirinstall.ycp 46402 2008-04-11 12:17:17Z jsrain $ + * $Id: dirinstall.ycp 46817 2008-04-18 07:38:10Z lslezak $ * */ @@ -12,6 +12,7 @@ textdomain "dirinstall"; import "CommandLine"; + import "PackageCallbacks"; symbol StartDirInstall() { @@ -23,13 +24,13 @@ import "DirInstall"; import "PackageLock"; - import "Product"; import "Report"; import "Progress"; - import "Popup"; include "dirinstall/ui.ycp"; + DirInstall::SetStarted(false); + // check whether having the packager for ourselves if (! PackageLock::Check ()) return `abort; @@ -61,10 +62,6 @@ stages, stages2, _("Please wait...")); - // install package callbacks - import "PackageCallbacksInit"; - PackageCallbacksInit::InitPackageCallbacks(); - Progress::NextStage(); // initializa the package manager @@ -74,92 +71,48 @@ Pkg::TargetFinish (); Pkg::SourceStartManager(true); - boolean have_patterns - = size (Pkg::ResolvableProperties ("", `pattern, "")) > 0; - boolean have_selections - = size (Pkg::GetSelections (`available, "base")) > 0; - have_patterns = have_patterns && ! have_selections; Progress::NextStage(); - if (have_patterns) - { - y2milestone ("Host system is using patterns"); + list > prods = Pkg::ResolvableProperties ("", `product, ""); + y2milestone("Found products: %1", prods); - Pkg::TargetInit ("/", false); - list > prods = Pkg::ResolvableProperties ("", `product, ""); - list > base_l = filter (map p, prods, { - return p["category"]:"" == "base"; - }); - map base = base_l[0]:$[]; - if (size (base_l) == 0) - { - y2warning ("No base product found, using first found product"); - base = prods[0]:$[]; - } - y2milestone ("Found base product: %1", base); - prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); - y2milestone ("Found appropriate base products in repositories: %1", prods); - if (size (prods) == 0) - { - // error report - Report::Error (_("Could not read package information.")); - Wizard::CloseDialog(); - return `abort; - } - map prod = prods[0]:$[]; - integer source = prod["source"]:-1; - map src_data = Pkg::SourceGeneralData (source); - y2milestone ("Repository: %1", src_data); - Pkg::SourceSetEnabled (source, false); - string url = src_data["url"]:""; - string dir = src_data["product_dir"]:"/"; - if (substring (url, 0, 3) == "cd:" || substring (url, 0, 4) == "dvd:") - { - if (! Popup::ContinueCancel (sformat (_("Insert %1 CD 1"), base["summary"]:""))) - { - Wizard::CloseDialog(); - return `back; - } - } - new_src = Pkg::SourceCreateBase (url, dir); - old_src = source; - using_patterns = true; - - string content_file = Pkg::SourceProvideFile (new_src, 1, "/content"); - SCR::RegisterAgent (.media.content, `ag_ini( - `IniAgent( content_file, - $[ - "options" : [ "read_only", "global_values", "flat" ], - "comments" : [ "^#.*", "^[ \t]*$", ], - "params" : [ - $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] - ] - ] - ))); - any tmp1 = SCR::Read (.media.content.PATTERNS); - if (tmp1 != nil) - Product::patterns = splitstring ((string)tmp1, " "); - y2milestone ("***Patterns: %1", Product::patterns); - Pkg::TargetFinish (); + list > base_l = filter (map p, prods, { + return p["category"]:"" == "base"; + }); + + map base = base_l[0]:$[]; + if (size (base_l) == 0) + { + y2warning ("No base product found, using first found product"); + base = prods[0]:$[]; } - else + + y2milestone ("Found base product: %1", base); + prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); + y2milestone ("Found appropriate base products in repositories: %1", prods); + if (size (prods) == 0) { - y2milestone ("Host system is using selections"); + // error report + Report::Error (_("Could not read package information.")); + Wizard::CloseDialog(); + return `abort; } + // select the base product for installation + Pkg::ResolvableInstall(base["name"]:"", `product); + symbol ret = Run (); Progress::NextStage(); y2milestone ("Sequence returned %1", ret); DirInstall::UmountFilesystems (); - if (using_patterns) + + if (DirInstall::GetStarted()) { - Pkg::SourceDelete (new_src); - Pkg::SourceSetEnabled (old_src, true); + DirInstall::FinishPackageManager (); } - DirInstall::FinishPackageManager (); Wizard::CloseDialog(); return ret; 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-dirinstall-2.16.1/src/clients/inst_dirinstall.ycp new/yast2-dirinstall-2.16.2/src/clients/inst_dirinstall.ycp --- old/yast2-dirinstall-2.16.1/src/clients/inst_dirinstall.ycp 2007-11-09 17:24:56.000000000 +0100 +++ new/yast2-dirinstall-2.16.2/src/clients/inst_dirinstall.ycp 2008-04-18 09:38:10.000000000 +0200 @@ -5,23 +5,18 @@ * * Purpose: Install into directory * - * $Id: inst_dirinstall.ycp 41800 2007-11-05 12:57:03Z locilka $ + * $Id: inst_dirinstall.ycp 46817 2008-04-18 07:38:10Z lslezak $ */ { textdomain "dirinstall"; import "DirInstall"; - import "Installation"; - import "Directory"; - import "Popup"; import "SlideShow"; - import "PackageInstallation"; - import "PackageCallbacks"; - import "Wizard"; - import "Progress"; import "String"; + DirInstall::SetStarted(true); + Pkg::TargetFinish (); DirInstall::MountFilesystems (); @@ -34,28 +29,6 @@ // initialize the slideshow SlideShow::InitPkgData(false); -/* - if(Pkg::TargetInit (Installation::destdir,true) != true) - { - // continue-cancel popup - if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) - { - return `abort; - } - } -*/ - - /* - boolean anyToDelete = Pkg::PkgAnyToDelete(); - SlideShow::SetLanguage (UI::GetLanguage(true)); - SlideShow::InitPkgData(); - SlideShow::OpenSlideShowDialog(); - - Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM"); - list commit_result = PackageInstallation::CommitPackages (0, 0); - - SlideShow::CloseSlideShowDialog(); - */ return `next; } 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-dirinstall-2.16.1/src/include/ui.ycp new/yast2-dirinstall-2.16.2/src/include/ui.ycp --- old/yast2-dirinstall-2.16.1/src/include/ui.ycp 2007-11-09 17:24:56.000000000 +0100 +++ new/yast2-dirinstall-2.16.2/src/include/ui.ycp 2008-04-18 09:38:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation into a directory * Authors: Anas Nashif * - * $Id: ui.ycp 41800 2007-11-05 12:57:03Z locilka $ + * $Id: ui.ycp 46817 2008-04-18 07:38:10Z lslezak $ * */ @@ -55,32 +55,36 @@ symbol ret = ProductControl::Run(); - // display a progress during exit - list<string> stages = - [ - // progress bar item - _("Finish the Package Manager"), - // progress bar item - _("Clean Up"), - ]; - - list<string> stages2 = - [ - // progress bar item - _("Finishing the Package Manager..."), - // progress bar item - _("Cleaning Up..."), - ]; - - // progres bar label - Progress::New (_("Finishing..."), " ", size(stages) - 1, - // progres bar label - stages, stages2, _("Please wait...")); + if (DirInstall::GetStarted()) + { + // display a progress during exit + list<string> stages = + [ + // progress bar item + _("Finish the Package Manager"), + // progress bar item + _("Clean Up"), + ]; + + list<string> stages2 = + [ + // progress bar item + _("Finishing the Package Manager..."), + // progress bar item + _("Cleaning Up..."), + ]; + + // progres bar label + Progress::New (_("Finishing..."), " ", size(stages) - 1, + // progres bar label + stages, stages2, _("Please wait...")); + + Progress::NextStage(); + + Pkg::SourceFinishAll (); + Pkg::TargetFinish(); + } - Progress::NextStage(); - - Pkg::SourceFinishAll (); - Pkg::TargetFinish(); Installation::destdir = "/"; return ret; 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-dirinstall-2.16.1/src/modules/DirInstall.ycp new/yast2-dirinstall-2.16.2/src/modules/DirInstall.ycp --- old/yast2-dirinstall-2.16.1/src/modules/DirInstall.ycp 2008-04-11 14:17:16.000000000 +0200 +++ new/yast2-dirinstall-2.16.2/src/modules/DirInstall.ycp 2008-04-18 09:38:10.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Instalation into a Directory settings, input and output functions * Authors: Anas Nashif * - * $Id: DirInstall.ycp 46402 2008-04-11 12:17:17Z jsrain $ + * $Id: DirInstall.ycp 46817 2008-04-18 07:38:10Z lslezak $ * */ { @@ -29,6 +29,8 @@ global string dirinstall_control_file = "/usr/share/YaST2/control/dirinstall.xml"; +boolean started = false; + list filesystems = [ ["/proc", "proc", "proc" ], ["/sys", "sysfs", "sysfs" ], @@ -36,6 +38,18 @@ list<string> mounted_fs = []; +global void SetStarted(boolean status) +{ + started = status; + y2milestone("DirInstall started set to: %1", started); +} + +global boolean GetStarted() +{ + y2milestone("DirInstall started: %1", started); + return started; +} + global integer GetTargetChangeTime() { return Installation::dirinstall_target_time; 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-dirinstall-2.16.1/VERSION new/yast2-dirinstall-2.16.2/VERSION --- old/yast2-dirinstall-2.16.1/VERSION 2008-04-11 14:17:24.000000000 +0200 +++ new/yast2-dirinstall-2.16.2/VERSION 2008-04-18 09:37:25.000000000 +0200 @@ -1 +1 @@ -2.16.1 +2.16.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org