Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Thu Sep 1 14:57:08 CEST 2011.
--------
--- yast2-packager/yast2-packager.changes 2011-08-15 13:22:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-08-31 15:09:34.000000000 +0200
@@ -1,0 +2,29 @@
+Wed Aug 31 12:21:00 UTC 2011 - lslezak@suse.cz
+
+- SpaceCalculation - improved target installation size estimation,
+ consider also filesystem properties (journal size, reserved space)
+ add some (static) non-package files to disk usage, increased
+ some spare size constants (bnc#263275)
+- 2.21.12
+
+-------------------------------------------------------------------
+Wed Aug 31 14:05:48 CEST 2011 - locilka@suse.cz
+
+- Cleaner solution for adjusting repository priority and fixing
+ that now it also works in installation (bnc#714027)
+
+-------------------------------------------------------------------
+Tue Aug 30 14:03:01 UTC 2011 - lslezak@suse.cz
+
+- webpin_package_search - display popup and print error message
+ when HTTP response code is not 200, don't silently ignore errors
+ (bnc#714546)
+
+-------------------------------------------------------------------
+Mon Aug 29 16:15:53 CEST 2011 - locilka@suse.cz
+
+- Implemented possibility to set repository priority while adding
+ by add_on_products.xml (bnc#714027).
+- 2.21.11
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.21.10.tar.bz2
New:
----
yast2-packager-2.21.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.BBWdn3/_old 2011-09-01 14:55:58.000000000 +0200
+++ /var/tmp/diff_new_pack.BBWdn3/_new 2011-09-01 14:55:58.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-packager
-Version: 2.21.10
+Version: 2.21.12
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.21.10.tar.bz2
+Source0: yast2-packager-2.21.12.tar.bz2
Prefix: /usr
@@ -34,8 +34,8 @@
# HTTP.ycp
BuildRequires: yast2-transfer
-# Installation summary in PackagesUI::
-BuildRequires: yast2 >= 2.18.1
+# String::FindMountPoint()
+BuildRequires: yast2 >= 2.21.13
# Pkg::SetZConfig()
BuildRequires: yast2-pkg-bindings >= 2.21.8
@@ -46,8 +46,8 @@
# Pkg::SetZConfig()
Requires: yast2-pkg-bindings >= 2.21.8
-# Installation summary in PackagesUI::
-Requires: yast2 >= 2.18.1
+# String::FindMountPoint()
+Requires: yast2 >= 2.21.13
# unzipping license file
Requires: unzip
@@ -100,7 +100,7 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.21.10
+%setup -n yast2-packager-2.21.12
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-packager-2.21.10.tar.bz2 -> yast2-packager-2.21.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/VERSION new/yast2-packager-2.21.12/VERSION
--- old/yast2-packager-2.21.10/VERSION 2011-08-15 13:21:33.000000000 +0200
+++ new/yast2-packager-2.21.12/VERSION 2011-08-31 14:20:55.000000000 +0200
@@ -1 +1 @@
-2.21.10
+2.21.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/configure new/yast2-packager-2.21.12/configure
--- old/yast2-packager-2.21.10/configure 2011-08-15 13:21:37.000000000 +0200
+++ new/yast2-packager-2.21.12/configure 2011-08-31 15:06:50.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.10.
+# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.12.
#
# 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.10'
-PACKAGE_STRING='yast2-packager 2.21.10'
+PACKAGE_VERSION='2.21.12'
+PACKAGE_STRING='yast2-packager 2.21.12'
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.10 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.21.12 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.10:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.21.12:";;
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.10
+yast2-packager configure 2.21.12
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.10, which was
+It was created by yast2-packager $as_me 2.21.12, 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.10'
+ VERSION='2.21.12'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.10"
+VERSION="2.21.12"
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.10, which was
+This file was extended by yast2-packager $as_me 2.21.12, 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.10
+yast2-packager config.status 2.21.12
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.10/configure.in new/yast2-packager-2.21.12/configure.in
--- old/yast2-packager-2.21.10/configure.in 2011-08-15 13:21:34.000000000 +0200
+++ new/yast2-packager-2.21.12/configure.in 2011-08-31 15:06:48.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.10, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.21.12, 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.10"
+VERSION="2.21.12"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/packager.pot new/yast2-packager-2.21.12/packager.pot
--- old/yast2-packager-2.21.10/packager.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.21.12/packager.pot 2008-09-10 10:47:12.000000000 +0200
@@ -0,0 +1,99 @@
+# translation of packager.po to
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Andrew Spackman , 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: packager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-04 13:54+0200\n"
+"PO-Revision-Date: 2008-08-27 21:38+1200\n"
+"Last-Translator: Andrew Spackman \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: src/clients/inst_packages.ycp:76
+msgid ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+msgstr ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and the software that has to be installed.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+
+#. TRANSLATORS: dialog help
+#: src/clients/inst_productsources.ycp:600
+msgid ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers dowloaded from Web.</p>\n"
+msgstr ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers downloaded from the Web.</p>\n"
+
+#. help, continued
+#: src/clients/repositories.ycp:486
+msgid ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
+"to also perform the changes in that package management system.</p>\n"
+msgstr ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will also call <tt>rug</tt>\n"
+"to perform the changes in that package management system.</p>\n"
+
+#: src/clients/webpin_package_search.ycp:223
+msgid ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level of trust\n"
+"depends on yourself. We do not take any responsibilities for installing\n"
+"such software.</p>"
+msgstr ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level of trust\n"
+"depends on yourself. We do not take any responsibility for installing\n"
+"such software.</p>"
+
+#. help text - media check 2/8
+#: src/include/checkmedia/ui.ycp:279
+msgid ""
+"<P>When you have a problem with\n"
+"the installation and are using a CD or DVD installation medium, you should check\n"
+"whether the medium is broken.</P>\n"
+msgstr ""
+"<P>When you have a problem with\n"
+"the installation and you are using a CD or DVD installation medium, you should check\n"
+"whether the medium is broken.</P>\n"
+
+#: src/include/checkmedia/ui.ycp:432
+msgid ""
+"The medium does not contain MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+msgstr ""
+"The medium does not contain a MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+
+#. (see bnc#178357 why these numbers)
+#. translators: help text for software proposal
+#: src/modules/Packages.ycp:302
+msgid "<P>The propsal contains total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
+msgstr "<P>The propsal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
+
+#. help text for software proposal
+#: src/modules/Packages.ycp:304
+msgid "<P>The total size to download is size of packages which will be downloaded from remote (network) repositories. This value is important when the connection is slow or when there is a data limit for downloading.</P>"
+msgstr ""
+"<P>The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n"
+" This value is important when the connection is slow or when there is a data limit for downloading.</P>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/src/clients/webpin_package_search.ycp new/yast2-packager-2.21.12/src/clients/webpin_package_search.ycp
--- old/yast2-packager-2.21.10/src/clients/webpin_package_search.ycp 2011-08-15 13:21:32.000000000 +0200
+++ new/yast2-packager-2.21.12/src/clients/webpin_package_search.ycp 2011-08-30 16:11:32.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Katarina Machalkova
* Lukas Ocilka
*
- * $Id: webpin_package_search.ycp 65153 2011-08-03 08:50:57Z lslezak $
+ * $Id: webpin_package_search.ycp 65454 2011-08-30 14:11:31Z lslezak $
*
* This client provides UI for searching for packages
* via Webpin XML.
@@ -344,7 +344,10 @@
Popup::ClearFeedback();
PopulatePackageList( search_results );
- if ( search_results == $[] || search_results == nil )
+ if (search_results == nil)
+ // error message
+ UI::ChangeWidget(`id("description"), `Value, _("<p><b>Search failed</b></p>"));
+ else if (search_results == $[])
UI::ChangeWidget(`id("description"), `Value, _("<p><b>No packages matching entered criteria were found</b></p>"));
else
CreatePackageDescription();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/src/modules/AddOnProduct.ycp new/yast2-packager-2.21.12/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.21.10/src/modules/AddOnProduct.ycp 2011-08-15 13:21:32.000000000 +0200
+++ new/yast2-packager-2.21.12/src/modules/AddOnProduct.ycp 2011-08-31 14:20:55.000000000 +0200
@@ -1314,6 +1314,11 @@
* default is 'false' (optional)
* -->
* <selected config:type="boolean">true</selected>
+ * <!--
+ * Defines priority of the newly added repository (optional).
+ * Libzypp uses its default priority if not set.
+ * -->
+ * <priority config:type="integer">20</priority>
*
*
* ...
@@ -1355,41 +1360,56 @@
return false;
}
+ integer repo_id = -1;
+
y2milestone ("Adding products: %1", add_products);
foreach (map one_product, add_products, {
string url = one_product["url"]:"";
string pth = one_product["path"]:"";
+ integer priority = one_product["priority"]:-1;
+
+ map new_repo = $[ "enabled" : true, "base_urls" : [url], "prod_dir" : pth ];
+ // BNC #714027: Possibility to adjust repository priority (usually higher)
+ if (priority > -1) new_repo["priority"] = priority;
- y2milestone ("Adding Repository: %1 %2", url, pth);
- integer src = Pkg::SourceCreate (url, pth);
+ y2milestone ("Adding Repository: %1", new_repo);
+ repo_id = Pkg::RepositoryAdd (new_repo);
- if (src == nil || src < 0) {
+ if (repo_id == nil || repo_id < 0) {
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 false;
}
- if (! AcceptedLicenseAndInfoFile (src)) {
+ // download metadata, build repo cache
+ Pkg::SourceRefreshNow (repo_id);
+ // load resolvables to zypp pool
+ Pkg::SourceLoad();
+
+ if (! AcceptedLicenseAndInfoFile (repo_id)) {
y2warning ("License not accepted, delete the repository");
- Pkg::SourceDelete (src);
+ Pkg::SourceDelete (repo_id);
return false;
}
- Integrate (src);
+ Integrate (repo_id);
// adding the product to the list of products (BNC #269625)
- map prod = (map ) Pkg::SourceProductData (src);
- y2milestone ("Repository (%1) product data: %2", src, prod);
+ map prod = (map ) Pkg::SourceProductData (repo_id);
+ y2milestone ("Repository (%1) product data: %2", repo_id, prod);
- InstallProductsFromRepository (one_product["install_products"]:[], src);
+ InstallProductsFromRepository (one_product["install_products"]:[], repo_id);
- AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[
- "media" : src,
+ map new_add_on_product = $[
+ "media" : repo_id,
"product" : one_product["name"]:prod["label"]:prod["productname"]:_("Unknown Product"),
"autoyast_product" : prod["productname"]:one_product["name"]:_("Unknown Product"),
"media_url" : url,
"product_dir" : pth,
- ]);
+ ];
+ if (priority > -1) new_add_on_product["priority"] = priority;
+
+ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, new_add_on_product);
});
});
@@ -1451,8 +1471,11 @@
string pth = prod["product_dir"]:"/";
integer src = Pkg::SourceCreate (media, pth);
if (src != -1) {
- if (prod["product"]:"" != "")
- Pkg::SourceEditSet ([$["SrcId":src, "name":prod["product"]:""]]);
+ if (prod["product"]:"" != "") {
+ map repo = $["SrcId":src, "name":prod["product"]:""];
+ if (prod["priority"]:-1 > -1) repo["priority"] = prod["priority"]:-1;
+ Pkg::SourceEditSet ([repo]);
+ }
mode_config_sources = add (mode_config_sources, src);
}
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.10/src/modules/SpaceCalculation.ycp new/yast2-packager-2.21.12/src/modules/SpaceCalculation.ycp
--- old/yast2-packager-2.21.10/src/modules/SpaceCalculation.ycp 2011-08-15 13:21:32.000000000 +0200
+++ new/yast2-packager-2.21.12/src/modules/SpaceCalculation.ycp 2011-08-31 14:55:08.000000000 +0200
@@ -10,7 +10,7 @@
* on Installation::sourcedir
*
*
- * $Id: SpaceCalculation.ycp 62829 2010-11-11 17:35:05Z lslezak $
+ * $Id: SpaceCalculation.ycp 65471 2011-08-31 12:55:07Z lslezak $
*/
{
@@ -93,7 +93,7 @@
list