Hello community, here is the log from the commit of package yast2-add-on checked in at Mon Sep 24 19:16:49 CEST 2007. -------- --- yast2-add-on/yast2-add-on.changes 2007-09-05 14:45:18.000000000 +0200 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-add-on/yast2-add-on.changes 2007-09-24 14:18:04.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 24 14:15:57 CEST 2007 - locilka@suse.cz + +- Do not ask whether to install packages in the inst-sys (#327742). +- 2.15.17 + +------------------------------------------------------------------- +Mon Sep 24 09:29:12 CEST 2007 - locilka@suse.cz + +- Calling Pkg::SourceReleaseAll(); after a new Add-On is used and + completely merged (#293428 c#44). +- 2.15.16 + +------------------------------------------------------------------- Old: ---- yast2-add-on-2.15.15.tar.bz2 New: ---- yast2-add-on-2.15.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.s13054/_old 2007-09-24 19:16:33.000000000 +0200 +++ /var/tmp/diff_new_pack.s13054/_new 2007-09-24 19:16:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on (Version 2.15.15) +# spec file for package yast2-add-on (Version 2.15.17) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,13 +11,13 @@ # norootforbuild Name: yast2-add-on -Version: 2.15.15 +Version: 2.15.17 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.15.15.tar.bz2 -prefix: /usr +Source0: yast2-add-on-2.15.17.tar.bz2 +Prefix: /usr Requires: autoyast2-installation # WorkflowManager module Requires: yast2 >= 2.15.22 @@ -33,7 +33,7 @@ Provides: yast2-installation:/usr/share/YaST2/clients/add-on.ycp # SCR::RegisterNewAgents, bugzilla #245508 Conflicts: yast2-core < 2.15.4 -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Add-On media installation code %description @@ -47,7 +47,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-add-on-2.15.15 +%setup -n yast2-add-on-2.15.17 %build %{prefix}/bin/y2tool y2autoconf @@ -84,8 +84,14 @@ %{prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on - %changelog +* Mon Sep 24 2007 - locilka@suse.cz +- Do not ask whether to install packages in the inst-sys (#327742). +- 2.15.17 +* Mon Sep 24 2007 - locilka@suse.cz +- Calling Pkg::SourceReleaseAll(); after a new Add-On is used and + completely merged (#293428 c#44). +- 2.15.16 * Wed Sep 05 2007 - locilka@suse.cz - NotEnoughMemory-functions moved to a separate misc.ycp include file to make them possible to be used from packager (#305554). ++++++ yast2-add-on-2.15.15.tar.bz2 -> yast2-add-on-2.15.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.15/src/add-on-workflow.ycp new/yast2-add-on-2.15.17/src/add-on-workflow.ycp --- old/yast2-add-on-2.15.15/src/add-on-workflow.ycp 2007-09-04 16:49:26.000000000 +0200 +++ new/yast2-add-on-2.15.17/src/add-on-workflow.ycp 2007-09-24 14:22:58.000000000 +0200 @@ -264,7 +264,11 @@ string required_package = "yast2-slp"; boolean installed_before = PackageSystem::Installed (required_package); - if (! Mode::installation () && ! installed_before) { + // in stage initial, packages can't be installed + // bugzilla #327742 + if (Stage::initial()) { + y2milestone ("Stage initial..."); + } else if (! installed_before) { // Tries to Check and Install packages if ( ! PackageSystem::CheckAndInstallPackagesInteractive ([required_package]) || @@ -1109,6 +1113,11 @@ // adding new add-on } else if (ret == `add) { + // bugzilla #293428 + // Release all sources before adding a new one + // because of CD/DVD + url cd:// + Pkg::SourceReleaseAll(); + // bugzilla #305788 // Use new wizard window for adding new Add-On. // Do not use "Steps" dialog. @@ -1125,7 +1134,13 @@ AddOnProduct::PrepareForRegistration (AddOnProduct::src_id); some_addon_changed = true; } - Redraw (enable_back, enable_next, back_button, next_button); + + Redraw (enable_back, enable_next, back_button, next_button); + + // bugzilla #293428 + // Release all sources after adding a new one + // because of CD/DVD + url cd:// + Pkg::SourceReleaseAll(); } } until ( ret == `next || ret == `back ); @@ -1141,6 +1156,11 @@ AddOnProduct::ReIntegrateFromScratch(); } } + + // bugzilla #293428 + // Release all sources after all Add-Ons are added and merged + y2milestone ("Releasing all sources..."); + Pkg::SourceReleaseAll(); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.15/src/add-on.ycp new/yast2-add-on-2.15.17/src/add-on.ycp --- old/yast2-add-on-2.15.15/src/add-on.ycp 2007-08-22 12:29:00.000000000 +0200 +++ new/yast2-add-on-2.15.17/src/add-on.ycp 2007-09-24 09:25:06.000000000 +0200 @@ -108,6 +108,12 @@ AddOnProduct::last_ret = `next; ret = RunAutorunWizard (); } + + // bugzilla #293428 + // Release all sources before adding a new one + // because of CD/DVD + url cd:// + Pkg::SourceReleaseAll(); + if (ret == `next) { // feedback heading diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.15/VERSION new/yast2-add-on-2.15.17/VERSION --- old/yast2-add-on-2.15.15/VERSION 2007-09-05 14:02:07.000000000 +0200 +++ new/yast2-add-on-2.15.17/VERSION 2007-09-24 14:15:49.000000000 +0200 @@ -1 +1 @@ -2.15.15 +2.15.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de