Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Tue Jun 28 15:09:01 CEST 2011.
--------
--- yast2-packager/yast2-packager.changes 2011-06-23 12:10:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-06-28 11:50:11.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jun 27 15:45:13 UTC 2011 - lslezak@suse.cz
+
+- remove the addon repository after aborting license confirmation
+ or canceling the package manager (bnc#701497, bnc#424655)
+- 2.21.4
+
+-------------------------------------------------------------------
+Fri Jun 24 13:10:26 UTC 2011 - lslezak@suse.cz
+
+- abort confirmation in license agreement - use Yes/No instead
+ of confusing Continue/Cancel
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.21.3.tar.bz2
New:
----
yast2-packager-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.STxgYc/_old 2011-06-28 15:08:26.000000000 +0200
+++ /var/tmp/diff_new_pack.STxgYc/_new 2011-06-28 15:08:26.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-packager
-Version: 2.21.3
+Version: 2.21.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.21.3.tar.bz2
+Source0: yast2-packager-2.21.4.tar.bz2
Prefix: /usr
@@ -100,7 +100,7 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.21.3
+%setup -n yast2-packager-2.21.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-packager-2.21.3.tar.bz2 -> yast2-packager-2.21.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/VERSION new/yast2-packager-2.21.4/VERSION
--- old/yast2-packager-2.21.3/VERSION 2011-06-23 12:07:37.000000000 +0200
+++ new/yast2-packager-2.21.4/VERSION 2011-06-28 11:37:02.000000000 +0200
@@ -1 +1 @@
-2.21.3
+2.21.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/configure new/yast2-packager-2.21.4/configure
--- old/yast2-packager-2.21.3/configure 2011-06-23 12:08:30.000000000 +0200
+++ new/yast2-packager-2.21.4/configure 2011-06-28 11:42:00.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.3.
+# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.21.3'
-PACKAGE_STRING='yast2-packager 2.21.3'
+PACKAGE_VERSION='2.21.4'
+PACKAGE_STRING='yast2-packager 2.21.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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.21.3 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.21.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.21.3:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.21.4:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.21.3
+yast2-packager configure 2.21.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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.21.3, which was
+It was created by yast2-packager $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.21.3'
+ VERSION='2.21.4'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.3"
+VERSION="2.21.4"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3379,7 +3379,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.21.3, which was
+This file was extended by yast2-packager $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-packager config.status 2.21.3
+yast2-packager config.status 2.21.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/configure.in new/yast2-packager-2.21.4/configure.in
--- old/yast2-packager-2.21.3/configure.in 2011-06-23 12:08:28.000000000 +0200
+++ new/yast2-packager-2.21.4/configure.in 2011-06-28 11:41:57.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.21.3, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.21.4, 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.21.3"
+VERSION="2.21.4"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/src/clients/repositories.ycp new/yast2-packager-2.21.4/src/clients/repositories.ycp
--- old/yast2-packager-2.21.3/src/clients/repositories.ycp 2010-11-19 10:59:33.000000000 +0100
+++ new/yast2-packager-2.21.4/src/clients/repositories.ycp 2011-06-28 11:37:38.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 62639 2010-10-15 08:52:37Z lslezak $
+ * $Id: repositories.ycp 64611 2011-06-28 09:37:37Z lslezak $
*
*/
@@ -1669,7 +1669,7 @@
],
"store" : $[
`next : "summary",
- `abort : `abort,
+ `abort : "summary",
],
];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/src/include/repositories_include.ycp new/yast2-packager-2.21.4/src/include/repositories_include.ycp
--- old/yast2-packager-2.21.3/src/include/repositories_include.ycp 2010-10-15 10:52:38.000000000 +0200
+++ new/yast2-packager-2.21.4/src/include/repositories_include.ycp 2011-06-28 11:37:38.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: Include file to be shared by yast2-packager and yast2-add-on
*
- * $Id: repositories_include.ycp 62639 2010-10-15 08:52:37Z lslezak $
+ * $Id: repositories_include.ycp 64611 2011-06-28 09:37:37Z lslezak $
*
*/
@@ -295,6 +295,8 @@
return `again;
}
+ y2milestone("New sources: %1", newSources);
+
if ( size( newSources ) == 0 )
{
y2error("Cannot add the repository");
@@ -327,10 +329,13 @@
else
{
Progress::NextStage();
+ boolean license_accepted = true;
foreach( integer id, newSources, ``{
if (! LicenseAccepted (id))
{
+ y2milestone("License NOT accepted, removing the source");
Pkg::SourceDelete (id);
+ license_accepted = false;
}
else
{
@@ -345,7 +350,7 @@
// relese (unmount) the medium
Pkg::SourceReleaseAll();
- return `ok;
+ return license_accepted ? `ok : `abort;
}
}
else
@@ -430,8 +435,12 @@
}
}
- if (createSource(url, plaindir, download_meta, name) == `again)
+ symbol ret = createSource(url, plaindir, download_meta, name);
+
+ if (ret == `again)
return `back;
+ else if (ret == `abort)
+ return `abort;
return `next;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/src/modules/AddOnProduct.ycp new/yast2-packager-2.21.4/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.21.3/src/modules/AddOnProduct.ycp 2011-06-16 10:18:19.000000000 +0200
+++ new/yast2-packager-2.21.4/src/modules/AddOnProduct.ycp 2011-06-28 11:26:20.000000000 +0200
@@ -796,6 +796,22 @@
RegisterAddOnProduct (src_id);
}
+ if (ret == `abort)
+ {
+ // cleanup after abort
+ y2milestone("Add-on installation aborted, removing installation source %1: %2", src_id, Pkg::SourceGeneralData(src_id));
+ Pkg::SourceDelete(src_id);
+ Pkg::SourceSaveAll();
+
+ // remove from the internal list
+ add_on_products = filter(map add_on_product, add_on_products,
+ {return add_on_product["media"]:-1 != src_id;}
+ );
+
+ // reset the src id, it's not valid
+ src_id = nil;
+ }
+
y2milestone ("Returning: %1", ret);
return ret;
}
@@ -1351,13 +1367,13 @@
y2error ("Unable to add product: %1", url);
// TRANSLATORS: error message, %1 is replaced with product URL
Report::Error (sformat (_("Unable to add product %1."), url));
- return;
+ return false;
}
if (! AcceptedLicenseAndInfoFile (src)) {
y2warning ("License not accepted, delete the repository");
Pkg::SourceDelete (src);
- return;
+ return false;
}
Integrate (src);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.3/src/modules/ProductLicense.ycp new/yast2-packager-2.21.4/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.21.3/src/modules/ProductLicense.ycp 2011-02-07 15:19:42.000000000 +0100
+++ new/yast2-packager-2.21.4/src/modules/ProductLicense.ycp 2011-06-24 15:09:21.000000000 +0200
@@ -907,7 +907,7 @@
}
} else {
// popup question
- if (Popup::ContinueCancel(_("Really abort the add-on product installation?"))) {
+ if (Popup::YesNo(_("Really abort the add-on product installation?"))) {
y2milestone("Aborting...");
ret = `abort;
break;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org