Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Nov 16 12:45:51 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-11-07 12:49:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-11-16 11:13:45.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Nov 16 11:00:34 CET 2007 - locilka@suse.cz
+
+- SCR agent for any_XML has been moved from yast2-packager-2.16.5
+ to yast2-2.16.11 (#332187).
+- Adjusted RPM dependencies.
+- 2.16.5
+
+-------------------------------------------------------------------
+Thu Nov 8 16:53:48 CET 2007 - locilka@suse.cz
+
+- Extended AskLicenseAgreement function not to skip already
+ accepted license if such behavior requested (because of 'going
+ back' in the installation workflow).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.4.tar.bz2
New:
----
yast2-packager-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.T17206/_old 2007-11-16 12:45:39.000000000 +0100
+++ /var/tmp/diff_new_pack.T17206/_new 2007-11-16 12:45:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.4)
+# spec file for package yast2-packager (Version 2.16.5)
#
# 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.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.4.tar.bz2
+Source0: yast2-packager-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
# Installation::installedVersion && Installation::updateVersion
@@ -31,7 +31,8 @@
Requires: yast2-pkg-bindings >= 2.15.38
# FileUtils::MD5sum
# AutoinstData
-Requires: yast2 >= 2.16.8
+# ag_anyxml moved there
+Requires: yast2 >= 2.16.11
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
@@ -65,7 +66,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.4
+%setup -n yast2-packager-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -101,6 +102,15 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Nov 16 2007 - locilka@suse.cz
+- SCR agent for any_XML has been moved from yast2-packager-2.16.5
+ to yast2-2.16.11 (#332187).
+- Adjusted RPM dependencies.
+- 2.16.5
+* Thu Nov 08 2007 - locilka@suse.cz
+- Extended AskLicenseAgreement function not to skip already
+ accepted license if such behavior requested (because of 'going
+ back' in the installation workflow).
* Wed Nov 07 2007 - locilka@suse.cz
- AutoinstSoftware::post_packages moved to
AutoinstData::post_packages to break cyclic dependencies.
++++++ yast2-packager-2.16.4.tar.bz2 -> yast2-packager-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.4/agents/ag_anyxml new/yast2-packager-2.16.5/agents/ag_anyxml
--- old/yast2-packager-2.16.4/agents/ag_anyxml 2007-11-05 13:33:35.000000000 +0100
+++ new/yast2-packager-2.16.5/agents/ag_anyxml 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#!/usr/bin/perl -w
-
-#
-# Name: ag_xmlrepos
-# Authors: Lukas Ocilka
-# 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 old/yast2-packager-2.16.4/agents/anyxml.scr new/yast2-packager-2.16.5/agents/anyxml.scr
--- old/yast2-packager-2.16.4/agents/anyxml.scr 2007-11-05 13:33:35.000000000 +0100
+++ new/yast2-packager-2.16.5/agents/anyxml.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-/**
- * File: anyxml.scr
- *
- * Summary: Agent for reading any XML files
- *
- * Authors: Lukas Ocilka
- *
- * Example: SCR::Read (.anyxml, "/root/some_file.xml")
- *
- * $Id:$
- */
-
-.anyxml
-
-`ag_anyxml ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.4/agents/Makefile.am new/yast2-packager-2.16.5/agents/Makefile.am
--- old/yast2-packager-2.16.4/agents/Makefile.am 2007-11-05 13:33:35.000000000 +0100
+++ new/yast2-packager-2.16.5/agents/Makefile.am 2007-11-16 11:01:37.000000000 +0100
@@ -4,12 +4,10 @@
agent_SCRIPTS = \
ag_xmlrepos \
- ag_anyxml \
ag_zypp_repos
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 old/yast2-packager-2.16.4/agents/Makefile.in new/yast2-packager-2.16.5/agents/Makefile.in
--- old/yast2-packager-2.16.4/agents/Makefile.in 2007-11-07 12:53:02.000000000 +0100
+++ new/yast2-packager-2.16.5/agents/Makefile.in 2007-11-16 11:16:11.000000000 +0100
@@ -177,12 +177,10 @@
ystartupdir = @ystartupdir@
agent_SCRIPTS = \
ag_xmlrepos \
- ag_anyxml \
ag_zypp_repos
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 old/yast2-packager-2.16.4/configure new/yast2-packager-2.16.5/configure
--- old/yast2-packager-2.16.4/configure 2007-11-07 12:53:02.000000000 +0100
+++ new/yast2-packager-2.16.5/configure 2007-11-16 11:16:10.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.4.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.4'
-PACKAGE_STRING='yast2-packager 2.16.4'
+PACKAGE_VERSION='2.16.5'
+PACKAGE_STRING='yast2-packager 2.16.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.16.4 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.16.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.16.4:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.5:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.4
+yast2-packager configure 2.16.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.16.4, which was
+It was created by yast2-packager $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.16.4'
+ VERSION='2.16.5'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.4"
+VERSION="2.16.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.16.4, which was
+This file was extended by yast2-packager $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.4
+yast2-packager config.status 2.16.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.4/configure.in new/yast2-packager-2.16.5/configure.in
--- old/yast2-packager-2.16.4/configure.in 2007-11-07 12:52:57.000000000 +0100
+++ new/yast2-packager-2.16.5/configure.in 2007-11-16 11:16:06.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.16.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.16.4, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.5, http://bugs.opensuse.org/, yast2-packager)
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.4"
+VERSION="2.16.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.4/src/modules/ProductLicense.ycp new/yast2-packager-2.16.5/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.16.4/src/modules/ProductLicense.ycp 2007-11-05 13:33:36.000000000 +0100
+++ new/yast2-packager-2.16.5/src/modules/ProductLicense.ycp 2007-11-08 16:53:35.000000000 +0100
@@ -544,10 +544,13 @@
* @param boolean enable_back sets the back_button status
* @param boolean base_product defines whether it is a base or add-on product
* true means base product, false add-on product
+ * @param require_agreement means that even if the license (or the very same license)
+ * has been already accepetd, ask user to accept it again (because of 'going back'
+ * in the installation proposal).
*/
global symbol AskLicenseAgreement (integer src_id, string dir,
list<string> patterns, string action, boolean enable_back,
- boolean base_product)
+ boolean base_product, boolean require_agreement)
{
string lic_lang = "";
map licenses = $[];
@@ -604,7 +607,7 @@
// Bugzilla #305503
string license_ident_lang = nil;
- // We need to store the oroginal -- not localized license ID (if possible)
+ // We need to store the original -- not localized license ID (if possible)
foreach (string check_this, ["", "en", lic_lang], {
if (contains (available_langs, check_this)) {
license_ident_lang = check_this;
@@ -619,8 +622,9 @@
string base_license = WhichLicenceFile (license_ident_lang, licenses);
string license_ident = GetLicenseIdentString (base_license);
+ // agreement might be required even if license has been already accepted
// defined, properly ($md5sum(32)-(1)$size(1..n))
- if (license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) {
+ if (require_agreement != true && license_ident != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) {
y2milestone ("License has been already accepted");
CleanUpLicense (tmpdir);
@@ -802,7 +806,7 @@
[ "license\\.txt", "license\\.%1\\.txt" ],
"abort",
// back button is disabled
- false, false);
+ false, false, false);
}
global symbol AskFirstStageLicenseAgreement (string action) {
@@ -817,13 +821,13 @@
[ "license\\.txt", "license\\.%1\\.txt" ],
action,
// back button is enabled
- enable_back, true);
+ enable_back, true, true);
}
global symbol AskInstalledLicenseAgreement (string directory,
list<string> patterns, string action)
{
- return AskLicenseAgreement (nil, directory, patterns, action, false, true);
+ return AskLicenseAgreement (nil, directory, patterns, action, false, true, false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.4/VERSION new/yast2-packager-2.16.5/VERSION
--- old/yast2-packager-2.16.4/VERSION 2007-11-07 12:50:02.000000000 +0100
+++ new/yast2-packager-2.16.5/VERSION 2007-11-16 10:58:24.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org