Author: lslezak
Date: Wed Jul 20 10:59:57 2011
New Revision: 64908
URL: http://svn.opensuse.org/viewcvs/yast?rev=64908&view=rev
Log:
backport from SP2 branch:
- correctly display download progress in DownloadInAdvance
libzypp mode (bnc#616708) (backported commits 62714,
partly 54940)
- support for download in advance mode in yast2-wagon (fate#308951)
- 2.17.79.1
Added:
branches/SuSE-Code-11-SP1-Branch/packager/agents/etc_zypp_conf.scr
- copied unchanged from r64331, branches/SuSE-Code-11-SP2-Branch/packager/agents/etc_zypp_conf.scr
Modified:
branches/SuSE-Code-11-SP1-Branch/packager/ (props changed)
branches/SuSE-Code-11-SP1-Branch/packager/VERSION
branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am
branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes
branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp
branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp
branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp
branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp
branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in
Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/VERSION?rev=64908&r1=64907&r2=64908&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 10:59:57 2011
@@ -1 +1 @@
-2.17.79
+2.17.79.1
Modified: branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am?rev=64908&r1=64907&r2=64908&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/agents/Makefile.am Wed Jul 20 10:59:57 2011
@@ -6,6 +6,7 @@
ag_zypp_repos
scrconf_DATA = \
+ etc_zypp_conf.scr \
zypp_repos.scr
EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes?rev=64908&r1=64907&r2=64908&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 10:59:57 2011
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Jul 20 08:58:01 UTC 2011 - lslezak@suse.cz
+
+- correctly display download progress in DownloadInAdvance
+ libzypp mode (bnc#616708) (backported commits 62714,
+ partly 54940)
+- support for download in advance mode in yast2-wagon (fate#308951)
+- 2.17.79.1
+
+-------------------------------------------------------------------
Wed Oct 27 10:14:52 CEST 2010 - mzugec@suse.cz
- backported layout change for repository (bnc#510794)
Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp?rev=64908&r1=64907&r2=64908&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/inst_rpmcopy.ycp Wed Jul 20 10:59:57 2011
@@ -202,7 +202,15 @@
}
// returns [ int successful, list failed, list remaining ]
- list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 );
+ map config = $[ "medium_nr" : current_cd_no ];
+ if (PackageInstallation::DownloadInAdvance() == true)
+ {
+ config["download_mode"] = `download_in_advance;
+ }
+
+ y2milestone("Commit config: %1", config);
+
+ list commit_result = PackageInstallation::Commit(config);
if (commit_result == nil || size (commit_result) == 0)
{
@@ -437,8 +445,13 @@
// sync package manager FIXME
if (result != `abort && ! Stage::initial ())
{
- y2milestone ("Calling PkgCommit (%1)", 9999);
- Pkg::PkgCommit (9999);
+ map config = $[];
+ if (PackageInstallation::DownloadInAdvance() == true)
+ {
+ config["download_mode"] = `download_in_advance;
+ }
+ y2milestone ("Calling Pkg::Commit(%1)", config);
+ Pkg::Commit(config);
}
// BNC #443755
Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp?rev=64908&r1=64907&r2=64908&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp Wed Jul 20 10:59:57 2011
@@ -21,6 +21,17 @@
import "Label";
+ boolean download_in_advance = nil;
+
+ global boolean DownloadInAdvance()
+ {
+ return download_in_advance;
+ }
+
+ global void SetDownloadInAdvance(boolean enable)
+ {
+ download_in_advance = enable;
+ }
global define any FakePackager( list<list> packages, string inst_source,
boolean deleting );
@@ -81,10 +92,8 @@
* Return: [ int successful, list failed, list remaining, list srcremaining ]
*
**/
- global define list CommitPackages (integer media_number,
- integer packages_installed)
+ global define list Commit(map config)
{
- y2milestone("CommitPackages called: media nr. %1, packages %2", media_number, packages_installed);
if ( Mode::test () )
{
@@ -95,8 +104,6 @@
}
// install packages from this media
- y2milestone ("CommitPackages (%1,%2): Pkg::TargetGetDU() %3",
- media_number, packages_installed, Pkg::TargetGetDU());
list <integer> sources = Pkg::SourceGetCurrent (false);
integer source_id = sources[0]:0;
@@ -111,45 +118,28 @@
y2milestone("ID of the first repository: %1", first_source);
- if (media_number == 0)
+ if (config["medium_nr"]:0 == 0)
{
PackageSlideShow::SetCurrentCdNo (first_source, 1);
}
else
{
- PackageSlideShow::SetCurrentCdNo (first_source, media_number);
+ PackageSlideShow::SetCurrentCdNo (first_source, config["medium_nr"]:0);
}
PackageSlideShow::UpdateAllCdProgress (false);
SlideShow::StartTimer();
- boolean do_commit = true;
- if (media_number != 0)
- {
- list