Hello community, here is the log from the commit of package yast2-packager checked in at Tue Jul 31 10:38:48 CEST 2007. -------- --- yast2-packager/yast2-packager.changes 2007-07-27 11:56:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-07-30 16:22:54.000000000 +0200 @@ -1,0 +2,33 @@ +Mon Jul 30 16:21:44 CEST 2007 - locilka@suse.cz + +- Adding new informative text where to find just displayed license + (FATE #302018). +- 2.15.52 + +------------------------------------------------------------------- +Mon Jul 30 13:29:10 CEST 2007 - lslezak@suse.cz + +- sw_single - do not abort after pressing [Continue] when a zypp + lock exists, use a separate error popup dialog (workaround + for #293356) +- inst_source - updated help text (#291004) +- 2.15.51 + +------------------------------------------------------------------- +Mon Jul 30 13:14:28 CEST 2007 - locilka@suse.cz + +- Community servers are not used during the installation (Bugzilla + #293811). + +------------------------------------------------------------------- +Mon Jul 30 11:41:35 CEST 2007 - jsrain@suse.cz + +- allow to display release notes while installing packages + (Fate #302342) + +------------------------------------------------------------------- +Fri Jul 27 14:15:40 CEST 2007 - locilka@suse.cz + +- Added new SCR agents ag_anyxml and ag_zypp_repos (FATE #301785). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.50.tar.bz2 New: ---- yast2-packager-2.15.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.o26975/_old 2007-07-31 10:38:39.000000000 +0200 +++ /var/tmp/diff_new_pack.o26975/_new 2007-07-31 10:38:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.50) +# spec file for package yast2-packager (Version 2.15.52) # # Copyright (c) 2007 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.15.50 +Version: 2.15.52 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.50.tar.bz2 +Source0: yast2-packager-2.15.52.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml BuildRequires: yast2 >= 2.15.38 @@ -55,7 +55,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.15.50 +%setup -n yast2-packager-2.15.52 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,24 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Mon Jul 30 2007 - locilka@suse.cz +- Adding new informative text where to find just displayed license + (FATE #302018). +- 2.15.52 +* Mon Jul 30 2007 - lslezak@suse.cz +- sw_single - do not abort after pressing [Continue] when a zypp + lock exists, use a separate error popup dialog (workaround + for #293356) +- inst_source - updated help text (#291004) +- 2.15.51 +* Mon Jul 30 2007 - locilka@suse.cz +- Community servers are not used during the installation (Bugzilla + [#293811]). +* Mon Jul 30 2007 - jsrain@suse.cz +- allow to display release notes while installing packages + (Fate #302342) +* Fri Jul 27 2007 - locilka@suse.cz +- Added new SCR agents ag_anyxml and ag_zypp_repos (FATE #301785). * Fri Jul 27 2007 - lslezak@suse.cz - use "Software Repositories" label in Y2CC (#215198) - Updated Progress callback handler to handle a "raw" progress ++++++ yast2-packager-2.15.50.tar.bz2 -> yast2-packager-2.15.52.tar.bz2 ++++++ ++++ 3772 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.15.50/agents/ag_anyxml new/yast2-packager-2.15.52/agents/ag_anyxml --- old/yast2-packager-2.15.50/agents/ag_anyxml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.15.52/agents/ag_anyxml 2007-07-26 14:05:26.000000000 +0200 @@ -0,0 +1,47 @@ +#!/usr/bin/perl -w + +# +# Name: ag_xmlrepos +# Authors: Lukas Ocilka <locilka@suse.cz> +# Summary: Agent for parsing any XML files +# + +use strict; +use lib "/usr/lib/YaST2/agents_non_y2"; +use ycp; +use XML::Bare; + +while (<STDIN>) { + my ($command, $path, $file) = ycp::ParseCommand ($_); + + if ($command eq "Read") { + if (! defined $file || $file eq "") { + y2error ("No file defined!"); + ycp::Return (undef); + next; + } elsif (! -e $file) { + y2error ("File ".$file." doesn't exist!"); + ycp::Return (undef); + next; + } + + y2milestone ("Reading: '".$file."'"); + open (FILE, $file) || do { + y2error ("Cannot open file ".$file.": ".$!); + next; + }; + my @lines = <FILE>; + close FILE; + + my $xml = new XML::Bare ('text' => join ('', @lines)); + my $root = $xml->parse(); + undef $xml; + + ycp::Return ($root); + } elsif ($command eq "result") { + exit 0; + } else { + my $return_value = sprintf( "Unknown instruction %s", $command); + ycp::Return ($return_value); + } +} 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.15.50/agents/ag_xmlrepos new/yast2-packager-2.15.52/agents/ag_xmlrepos --- old/yast2-packager-2.15.50/agents/ag_xmlrepos 2007-07-20 17:25:47.000000000 +0200 +++ new/yast2-packager-2.15.52/agents/ag_xmlrepos 2007-07-26 14:05:17.000000000 +0200 @@ -12,8 +12,6 @@ use ycp; use XML::Bare; -our %TYPEINFO; - sub GetListFromVariable { my $variable = shift || {}; @@ -174,7 +172,7 @@ } y2milestone ("Reading: '".$file."'"); - open FILE, $file || do { + open (FILE, $file) || do { y2error ("Cannot open file ".$file.": ".$!); 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-packager-2.15.50/agents/ag_zypp_repos new/yast2-packager-2.15.52/agents/ag_zypp_repos --- old/yast2-packager-2.15.50/agents/ag_zypp_repos 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.15.52/agents/ag_zypp_repos 2007-07-26 17:13:03.000000000 +0200 @@ -0,0 +1,69 @@ +#!/usr/bin/perl -w + +# +# Name: ag_zypp_repos +# Authors: Lukas Ocilka <locilka@suse.cz> +# Summary: Reads directory of zypp repositories and parses files +# found. Returns them as a map. +# + +use strict; +use lib "/usr/lib/YaST2/agents_non_y2"; +use ycp; + +while (<STDIN>) { + my ($command, $path, $dir) = ycp::ParseCommand ($_); + + if ($command eq "Read") { + if (! defined $dir || $dir eq "") { + $dir = '/etc/zypp/repos.d/'; + y2milestone ("Using default dir: ".$dir); + } + + if (! -d $dir) { + y2error ("Directory ".$dir." doesn't exist!"); + ycp::Return (undef); + next; + } + + y2milestone ("Reading: '".$dir."'"); + + my @zypp_repos = (); + + opendir (DIR, $dir); + my @files = grep (!/^\.{1,2}$/, readdir(DIR)); + closedir(DIR); + + foreach my $file (@files) { + my $this_entry = {}; + + $file = $dir.'/'.$file; + y2milestone ("Parsing file: ".$file); + open (FILE, $file) || do { + y2error ("Cannot open file ".$file.": ".$!); + next; + }; + my @lines = <FILE>; + close FILE; + + foreach my $line (@lines) { + chop $line; + + if ($line =~ /^[ \t]*\[([^\]]+)\][ \t]*$/) { + $this_entry->{'id'} = $1; + } elsif ($line =~ /^([^=]+)[ \t]*=[ \t]*(.*)$/) { + $this_entry->{$1} = $2; + } + } + + push @zypp_repos, $this_entry; + } + + ycp::Return (\@zypp_repos); + } elsif ($command eq "result") { + exit 0; + } else { + my $return_value = sprintf( "Unknown instruction %s", $command); + ycp::Return ($return_value); + } +} 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.15.50/agents/anyxml.scr new/yast2-packager-2.15.52/agents/anyxml.scr --- old/yast2-packager-2.15.50/agents/anyxml.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.15.52/agents/anyxml.scr 2007-07-26 10:15:26.000000000 +0200 @@ -0,0 +1,15 @@ +/** + * File: anyxml.scr + * + * Summary: Agent for reading any XML files + * + * Authors: Lukas Ocilka <locilka@suse.cz> + * + * Example: SCR::Read (.anyxml, "/root/some_file.xml") + * + * $Id:$ + */ + +.anyxml + +`ag_anyxml () 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.15.50/agents/Makefile.am new/yast2-packager-2.15.52/agents/Makefile.am --- old/yast2-packager-2.15.50/agents/Makefile.am 2007-07-20 17:25:47.000000000 +0200 +++ new/yast2-packager-2.15.52/agents/Makefile.am 2007-07-26 13:49:51.000000000 +0200 @@ -2,8 +2,14 @@ # Makefile.am for packager/agents # -agent_SCRIPTS = ag_xmlrepos +agent_SCRIPTS = \ + ag_xmlrepos \ + ag_anyxml \ + ag_zypp_repos -scrconf_DATA = xmlrepos.scr +scrconf_DATA = \ + xmlrepos.scr \ + anyxml.scr \ + zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) 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.15.50/agents/zypp_repos.scr new/yast2-packager-2.15.52/agents/zypp_repos.scr --- old/yast2-packager-2.15.50/agents/zypp_repos.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.15.52/agents/zypp_repos.scr 2007-07-26 13:49:33.000000000 +0200 @@ -0,0 +1,15 @@ +/** + * File: zypp_repos.scr + * + * Summary: Agent for reading zypp repos in a defined directory + * + * Authors: Lukas Ocilka <locilka@suse.cz> + * + * Example: SCR::Read (.zypp_repos, "/etc/zypp/repo.d/") + * + * $Id:$ + */ + +.zypp_repos + +`ag_zypp_repos () 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.15.50/configure.in new/yast2-packager-2.15.52/configure.in --- old/yast2-packager-2.15.50/configure.in 2007-07-27 11:55:19.000000000 +0200 +++ new/yast2-packager-2.15.52/configure.in 2007-07-19 18:31:02.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.15.50, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.46, http://bugs.opensuse.org/, 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.15.50" +VERSION="2.15.46" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@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-packager-2.15.50/src/clients/inst_productsources.ycp new/yast2-packager-2.15.52/src/clients/inst_productsources.ycp --- old/yast2-packager-2.15.50/src/clients/inst_productsources.ycp 2007-07-20 17:25:46.000000000 +0200 +++ new/yast2-packager-2.15.52/src/clients/inst_productsources.ycp 2007-07-30 13:11:15.000000000 +0200 @@ -14,13 +14,18 @@ * <servers config:type="list"> * <item> * <link>http://some.server/some_link.xml</link> + * <official config:type="boolean">true</official> * </item> * <item> * <link>ftp://some.other.server/some_link.xml</link> + * <official config:type="boolean">false</official> * </item> * </servers> * </productDefines> * + * Only official (trusted) links are used during installation. + * See Bugzilla #293811. + * * Format of Suggested sources: * <?xml version="1.0"?> * <metapackage xmlns:os="http://opensuse.org/Standards/One_Click_Install" xmlns="http://opensuse.org/Standards/One_Click_Install"> @@ -283,6 +288,19 @@ list_of_servers = xml_file_content["servers"]:[]; + // bugzilla #293811 + // only official (trusted) links are used during installation + if (Stage::initial()) { + list_of_servers = filter (map one_server, list_of_servers, { + if (one_server["official"]:false == true) { + return true; + } else { + y2milestone ("Sever %1 is not used during installation...", one_server); + return false; + } + }); + } + return true; } 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.15.50/src/clients/inst_source.ycp new/yast2-packager-2.15.52/src/clients/inst_source.ycp --- old/yast2-packager-2.15.50/src/clients/inst_source.ycp 2007-07-27 11:54:28.000000000 +0200 +++ new/yast2-packager-2.15.52/src/clients/inst_source.ycp 2007-07-30 14:41:45.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: inst_source.ycp 39738 2007-07-27 09:54:28Z lslezak $ + * $Id: inst_source.ycp 39779 2007-07-30 12:27:31Z lslezak $ * */ @@ -483,9 +483,12 @@ `Left (`Label ("Category:")) )), `VSpacing (0.4), + // label `Left (`Label (_("Properties"))), + // check box `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))), - `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Autorefresh"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))), `VSpacing (0.4), (have_rug) ? `Left (`CheckBox (`id (`zmdsync), @@ -550,24 +553,14 @@ </p> "); - // help, continued - help_text = help_text + _("<p> -<b>Network</b> installation requires a working network connection. -Configure YaST2's \"Network Devices\" module first, -if required. Specify the directory where the packages from -the first CD are located, such as /data1/CD1. -Only the base path is -required if packages are in one directory, for example, /usr/full-i386. -</p> -"); // help, continued help_text = help_text + _("<p> -<b>Modifying a Repository</b> -To change a repository media, use <b>Edit</b>. To remove a repository, use -<b>Delete</b>. To enable or disable the repository, set refreshing on the -initialization time on or off, immediate refreshing or renaming the repository, use -<b>Repository Settings</b>.</p>"); +<b>Modifying a Repository Status</b> +To change a repository location, use <b>Edit</b>. To remove a repository, use +<b>Delete</b>. To enable or disable the repository or to change the refresh status in the +initialization time select the repository in the table and use the check boxes below. +</p>"); if (have_rug) { 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.15.50/src/clients/sw_single.ycp new/yast2-packager-2.15.52/src/clients/sw_single.ycp --- old/yast2-packager-2.15.50/src/clients/sw_single.ycp 2007-07-19 13:46:48.000000000 +0200 +++ new/yast2-packager-2.15.52/src/clients/sw_single.ycp 2007-07-30 13:33:06.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 39526 2007-07-19 11:46:47Z lslezak $ + * $Id: sw_single.ycp 39774 2007-07-30 11:32:06Z lslezak $ */ { @@ -275,12 +275,24 @@ // check whether running as root // and having the packager for ourselves - if (! Confirm::MustBeRoot () || ! PackageLock::Check ()) + if (! Confirm::MustBeRoot ()) { UI::CloseDialog (); return `abort; } + // TODO: the check dialog contains only [Continue] [Retry] buttons + // there is no [Abort] (#293356) + if (!PackageLock::Check()) + { + // error message - SW management is already in use, access denied + // the yast module cannot be started + Report::Error(_("The software management module cannot work +without access to the software management system.")); + UI::CloseDialog (); + return `abort; + } + // check Args // set test_mode, test_popup list<string> arg_list = CheckArguments(); 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.15.50/src/include/load_release_notes.ycp new/yast2-packager-2.15.52/src/include/load_release_notes.ycp --- old/yast2-packager-2.15.50/src/include/load_release_notes.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.15.52/src/include/load_release_notes.ycp 2007-07-30 12:52:36.000000000 +0200 @@ -0,0 +1,64 @@ +/** + * File: installation/include/load_release_notes.ycp + * Module: Installation + * Summary: Load release notes from media + * Authors: Arvin Schnell <arvin@suse.de> + * Jiri Srain <jsrain@suse.cz> + * + * Load release notes from media + * + * $Id: release_notes_popup.ycp 34411 2006-11-15 13:45:11Z locilka $ + */ + +{ + textdomain "installation"; + + import "Language"; + import "Report"; + import "Stage"; + + /* release notes */ + string media_text = ""; + + +// FIXME get rid of similar funciton in instlalation/clients/release_notes_popup.ycp + + /* function to load release notes */ + define boolean load_release_notes (integer source_id) + { + string path_to_relnotes = "/docu"; + string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; + y2debug ("Path template: %1", path_templ); + string tmp = sformat (path_templ, Language::language); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); + if (tmp == nil) + { + tmp = sformat (path_templ, substring (Language::language, 0, 2)); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); + } + if (tmp == nil) + { + tmp = sformat (path_templ, "en"); + y2debug ("Trying to get %1", tmp); + tmp = Pkg::SourceProvideFile (source_id, 1, tmp); + } + if (tmp == nil) + return false; + + media_text = (string)SCR::Read (.target.string, [tmp, ""]); + if (media_text != "" && media_text != nil) + return true; + return false; + }; + + string media_prefix = +// beginning of the rich text with the release notes +_("<p><b>These are the release notes made for the first initial release. They are +part of the installation media. During installation, if a connection +to the Internet is available, you can download updated release notes +from the SUSE Linux Web server.</b></p>"); + +} + 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.15.50/src/include/Makefile.am new/yast2-packager-2.15.52/src/include/Makefile.am --- old/yast2-packager-2.15.50/src/include/Makefile.am 2007-05-18 12:48:14.000000000 +0200 +++ new/yast2-packager-2.15.52/src/include/Makefile.am 2007-07-30 12:52:36.000000000 +0200 @@ -7,7 +7,8 @@ ynclude_DATA = \ inst_source_dialogs.ycp \ - storage_include.ycp + storage_include.ycp \ + load_release_notes.ycp EXTRA_DIST = $(ynclude_DATA) 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.15.50/src/modules/Makefile.am new/yast2-packager-2.15.52/src/modules/Makefile.am --- old/yast2-packager-2.15.50/src/modules/Makefile.am 2007-07-16 15:53:26.000000000 +0200 +++ new/yast2-packager-2.15.52/src/modules/Makefile.am 2007-07-30 12:52:36.000000000 +0200 @@ -1,5 +1,13 @@ # Makefile.am for packager/src/modules +YCPCFLAGS = -I . -M . + module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm) EXTRA_DIST = $(module_DATA) + +packager: + ln -sf ../include packager + +ycpchook = packager + include $(top_srcdir)/Makefile.am.common 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.15.50/src/modules/Packages.ycp new/yast2-packager-2.15.52/src/modules/Packages.ycp --- old/yast2-packager-2.15.50/src/modules/Packages.ycp 2007-07-25 14:22:44.000000000 +0200 +++ new/yast2-packager-2.15.52/src/modules/Packages.ycp 2007-07-30 12:52:36.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Packages.ycp 39526 2007-07-19 11:46:47Z lslezak $ + * $Id: Packages.ycp 39763 2007-07-30 10:47:35Z jsrain $ */ { @@ -39,6 +39,8 @@ import "FileUtils"; import "PackageCallbacks"; +include "packager/load_release_notes.ycp"; + /** * Force full proposal routine next run */ @@ -823,6 +825,11 @@ y2milestone ("Setting up the slide directory local copy: %1", our_slidedir); SlideShow::SetSlideDir (our_slidedir); + if (load_release_notes (source)) + { + SlideShow::relnotes = media_prefix + media_text; + } + } integer IntegrateServicePack (boolean show_popup, string base_url) { 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.15.50/src/modules/ProductLicense.ycp new/yast2-packager-2.15.52/src/modules/ProductLicense.ycp --- old/yast2-packager-2.15.50/src/modules/ProductLicense.ycp 2007-07-19 13:22:40.000000000 +0200 +++ new/yast2-packager-2.15.52/src/modules/ProductLicense.ycp 2007-07-30 16:46:21.000000000 +0200 @@ -123,7 +123,7 @@ }); term contents = `VBox ( - `VSpacing (space), + `VSpacing (1), `HBox ( `HSpacing (2*space), `VBox ( @@ -151,7 +151,18 @@ `HSpacing (2*space) ) ), - `VSpacing(2) + `VSpacing(1), + `HBox ( + `HSpacing (2*space), + `Left ( + // TRANSLATORS: addition license information + // FATE #302018 + `Label (_("If you like to print this license, +check the EULA.txt file on the first media.")) + ), + `HSpacing (2*space) + ), + `VSpacing (1) ); // help text 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.15.50/src/modules/SlideShow.ycp new/yast2-packager-2.15.52/src/modules/SlideShow.ycp --- old/yast2-packager-2.15.50/src/modules/SlideShow.ycp 2007-07-24 16:30:33.000000000 +0200 +++ new/yast2-packager-2.15.52/src/modules/SlideShow.ycp 2007-07-30 12:52:36.000000000 +0200 @@ -5,7 +5,7 @@ * * Author: Stefan Hundhammer <sh@suse.de> * - * $Id: SlideShow.ycp 39643 2007-07-24 14:30:33Z lslezak $ + * $Id: SlideShow.ycp 39763 2007-07-30 10:47:35Z jsrain $ * */ { @@ -70,6 +70,8 @@ boolean user_abort = false; + global string relnotes = nil; + /** * Constructor **/ @@ -147,6 +149,15 @@ return widgets_created && UI::WidgetExists(`slidesPage ); } + /** + * Check if currently the "Release Notes" page is shown + * @return true if showing details, false otherwise + **/ + boolean ShowingRelNotes() + { + return widgets_created && UI::WidgetExists(`relNotesPage); + } + /** * Sum up all list items @@ -1483,6 +1494,14 @@ return widgets; } + term RelNotesPageWidgets() { + term widgets = AddProgressWidgets (`relNotesPage, + `RichText (relnotes) + ); + y2debug( "widget term: \n%1", widgets ); + return widgets; + } + /** * Switch from the 'details' view to the 'slide show' view. @@ -1522,6 +1541,22 @@ UI::ChangeWidget(`instLog, `Value, inst_log ); } + /** + * Switch to the 'release notes' view. + **/ + global void SwitchToReleaseNotesView() + { + if ( ShowingRelNotes() ) + return; + + if ( UI::WidgetExists(`tabContents ) ) + { + UI::ChangeWidget(`dumbTab, `CurrentItem, `showRelNotes ); + UI::ReplaceWidget(`tabContents, RelNotesPageWidgets() ); + UpdateTotalProgress(false); + } + } + string HelpText() { @@ -1541,14 +1576,18 @@ if ( UI::HasSpecialWidget(`DumbTab) && HaveSlideSupport() && HaveSlides() ) { - contents = - `DumbTab(`id(`dumbTab ), - [ + list tabs = [ + // tab + `item(`id(`showSlide ), _("Slide Sho&w") ), + // tab + `item(`id(`showDetails ), _("&Details") ) + ]; + if (relnotes != nil && relnotes != "") // tab - `item(`id(`showSlide ), _("Slide Sho&w") ), - // tab - `item(`id(`showDetails ), _("&Details") ) - ], + tabs = add (tabs, `item (`id (`showRelNotes), _("Release &Notes"))); + + contents = + `DumbTab(`id(`dumbTab ), tabs, `VBox( `VSpacing( 0.4 ), `VWeight( 1, // lower layout priority @@ -1788,6 +1827,11 @@ UI::ChangeWidget(`dumbTab, `CurrentItem, `showDetails ); } } + else if ( button == `showRelNotes && ! ShowingRelNotes() ) + { + user_switched_to_details = false; + SwitchToReleaseNotesView(); + } else if ( button == `debugHotkey ) { debug = ! debug; 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.15.50/VERSION new/yast2-packager-2.15.52/VERSION --- old/yast2-packager-2.15.50/VERSION 2007-07-27 11:54:54.000000000 +0200 +++ new/yast2-packager-2.15.52/VERSION 2007-07-30 16:23:01.000000000 +0200 @@ -1 +1 @@ -2.15.50 +2.15.52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org