Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Apr 10 16:57:48 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-07 15:13:05.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-10 16:55:24.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 10 16:53:24 CEST 2006 - visnov@suse.cz
+
+- adapt slideshow for new pkg-bindings API (#161298)
+- 2.13.73
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.72.tar.bz2
New:
----
yast2-packager-2.13.73.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.3SAlJT/_old 2006-04-10 16:57:09.000000000 +0200
+++ /var/tmp/diff_new_pack.3SAlJT/_new 2006-04-10 16:57:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.72)
+# spec file for package yast2-packager (Version 2.13.73)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.13.72
+Version: 2.13.73
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.72.tar.bz2
+Source0: yast2-packager-2.13.73.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.72
+%setup -n yast2-packager-2.13.73
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,9 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Mon Apr 10 2006 - visnov@suse.cz
+- adapt slideshow for new pkg-bindings API (#161298)
+- 2.13.73
* Fri Apr 07 2006 - lslezak@suse.cz
- display a warning when Pkg::SourceStartCache fails (#163267)
- 2.13.72
++++++ yast2-packager-2.13.72.tar.bz2 -> yast2-packager-2.13.73.tar.bz2 ++++++
++++ 2633 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-packager-2.13.72/Makefile.am new/yast2-packager-2.13.73/Makefile.am
--- old/yast2-packager-2.13.72/Makefile.am 2006-03-06 14:16:53.000000000 +0100
+++ new/yast2-packager-2.13.73/Makefile.am 2006-03-13 14:18:11.000000000 +0100
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
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-packager-2.13.72/VERSION new/yast2-packager-2.13.73/VERSION
--- old/yast2-packager-2.13.72/VERSION 2006-04-07 14:53:27.000000000 +0200
+++ new/yast2-packager-2.13.73/VERSION 2006-04-10 16:53:21.000000000 +0200
@@ -1 +1 @@
-2.13.72
+2.13.73
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-packager-2.13.72/configure.in new/yast2-packager-2.13.73/configure.in
--- old/yast2-packager-2.13.72/configure.in 2006-03-06 14:16:53.000000000 +0100
+++ new/yast2-packager-2.13.73/configure.in 2006-03-13 14:18:11.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.39, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.41, http://www.suse.de/feedback, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.39"
+VERSION="2.13.41"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
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-packager-2.13.72/src/modules/PackageCallbacks.ycp new/yast2-packager-2.13.73/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.13.72/src/modules/PackageCallbacks.ycp 2006-03-10 16:38:54.000000000 +0100
+++ new/yast2-packager-2.13.73/src/modules/PackageCallbacks.ycp 2006-04-07 17:07:16.000000000 +0200
@@ -697,7 +697,7 @@
global void SourceChange (integer source, integer medianr)
{
y2milestone ("SourceChange (%1, %2)", source, medianr);
- _current_source = source + 1;
+ _current_source = source;
}
boolean refresh_open = false;
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-packager-2.13.72/src/modules/SlideShow.ycp new/yast2-packager-2.13.73/src/modules/SlideShow.ycp
--- old/yast2-packager-2.13.72/src/modules/SlideShow.ycp 2006-03-29 14:28:05.000000000 +0200
+++ new/yast2-packager-2.13.73/src/modules/SlideShow.ycp 2006-04-10 16:51:48.000000000 +0200
@@ -23,6 +23,7 @@
global list<string> inst_src_names = []; // a list of strings identifying each installation source
global list total_pkg_count_per_cd_per_src = []; // number of pkgs per inst-src: [ [7, 5, 3], [2, 3, 4] ]
global list remaining_pkg_count_per_cd_per_src = []; // remaining number of pkgs
+ global map srcid_to_current_src_no = $[];
global string media_type = "CD";
global integer total_size_installed = 0;
global integer total_size_to_install = 0;
@@ -586,7 +587,7 @@
integer file_pos = findlastof(pkg_name, "/");
- if (file_pos > 0 )
+ if (file_pos != nil && file_pos > 0 )
{
// return just the file name
pkg_name = substring(pkg_name, file_pos + 1);
@@ -1582,8 +1583,21 @@
current_slide_no = 0;
slide_start_time = 0;
+ list< list > src_list = Pkg::PkgMediaNames();
+ inst_src_names = maplist( list src, src_list, ``(src[0]:"CD") );
+
+ y2milestone ("Media names: %1", inst_src_names);
+
+ integer index = 0;
+
+ srcid_to_current_src_no = listmap( list src, src_list, {
+ index = index + 1;
+ return $[src[1]:-1 : index];
+ });
+
+ y2milestone ("Source mapping information: %1", srcid_to_current_src_no );
+
total_sizes_per_cd_per_src = Pkg::PkgMediaSizes();
- inst_src_names = Pkg::PkgMediaNames();
total_pkg_count_per_cd_per_src = Pkg::PkgMediaCount();
@@ -1651,7 +1665,7 @@
global void SetCurrentCdNo( integer src_no, integer cd_no )
{
y2milestone("SetCurrentCdNo() - src: %1 , CD: %2", src_no, cd_no);
- current_src_no = src_no;
+ current_src_no = srcid_to_current_src_no[src_no]:-1;
current_cd_no = cd_no;
CheckForSlides();
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-packager-2.13.72/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.13.73/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.13.72/src/modules/SlideShowCallbacks.ycp 2006-03-10 16:37:32.000000000 +0100
+++ new/yast2-packager-2.13.73/src/modules/SlideShowCallbacks.ycp 2006-04-10 15:42:20.000000000 +0200
@@ -229,7 +229,7 @@
global void CallbackSourceChange( integer source, integer media)
{
PackageCallbacks::SourceChange( source, media ); // inform PackageCallbacks about the change
- SlideShow::SetCurrentCdNo( source+1, media );
+ SlideShow::SetCurrentCdNo( source, media );
SlideShow::UpdateCurrentPackageProgress(0);
SlideShow::UpdateAllCdProgress();
};
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-packager-2.13.72/src/modules/test.ycp new/yast2-packager-2.13.73/src/modules/test.ycp
--- old/yast2-packager-2.13.72/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.13.73/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
- import "Package";
- import "CommandLine";
-
- textdomain "test";
-
- boolean startHandler(map opts) {
- Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-// Package::InstallAll(["sambadocdfdfdf"]);
-
- return true;
- }
-
- symbol GUIhandler() {
- y2milestone("GUIhandler");
- return `next;
- }
-
- boolean Read() {
- return true;
- }
-
- boolean Write() {
- return true;
- }
-
- map cmdline = $[
- // help text
- "help" : _("Start installation in a virtual machine"),
- "id" : "vm",
- "guihandler": GUIhandler,
- "initialize": Read,
- "finish" : Write,
- "actions" : $[
- "start" : $[
- // command description
- "help" : _("Start installation"),
- "handler" : startHandler
- ]
- ],
- "options" : $[
- "configured" : $[
- // option description
- "help" : _("List only configured devices")
- ],
- "all" : $[
- // option description
- "help" : _("List all detected IDE devices")
- ]
- ],
- "mappings" : $[
- "start" : ["configured", "all"],
- ]
- ];
-
- any ret = CommandLine::Run(cmdline);
-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...