Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Wed Apr 15 00:24:33 CEST 2009.
--------
--- yast2-packager/yast2-packager.changes 2009-03-17 19:54:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2009-04-10 17:37:42.283390000 +0200
@@ -1,0 +2,31 @@
+Fri Apr 10 16:48:28 CEST 2009 - lslezak@suse.cz
+
+- repository manager - do not refresh CD/DVD repositories after
+ changing the name, correctly display current scheme (CD/DVD),
+ preserve device options when changing the repository name
+ (bnc#469193)
+- 2.18.5
+
+-------------------------------------------------------------------
+Wed Apr 8 10:38:15 CEST 2009 - lslezak@suse.cz
+
+- Slideshow fixes - display additional rpm output in the
+ installation log, use installation log summary instead of
+ non-existing y2logRPM file (bnc#456446)
+- Avoid division by zero when total size to install is less than
+ 1024B (converted to 0kB)
+
+-------------------------------------------------------------------
+Fri Apr 3 14:31:20 CEST 2009 - locilka@suse.cz
+
+- Adjusting initial repository name according to LABEL in content
+ file. Exporting the same function for Add-Ons (bnc #481828).
+- 2.18.4
+
+-------------------------------------------------------------------
+Mon Mar 30 14:41:21 CEST 2009 - lslezak@suse.cz
+
+- sw_single - display the installation summary when there is
+ something to install/remove at start (bnc#465194)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.18.3.tar.bz2
New:
----
yast2-packager-2.18.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.k19497/_old 2009-04-15 00:24:08.000000000 +0200
+++ /var/tmp/diff_new_pack.k19497/_new 2009-04-15 00:24:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.18.3)
+# spec file for package yast2-packager (Version 2.18.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.18.3
+Version: 2.18.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.18.3.tar.bz2
+Source0: yast2-packager-2.18.5.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.18.3
+%setup -n yast2-packager-2.18.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,25 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Apr 10 2009 lslezak@suse.cz
+- repository manager - do not refresh CD/DVD repositories after
+ changing the name, correctly display current scheme (CD/DVD),
+ preserve device options when changing the repository name
+ (bnc#469193)
+- 2.18.5
+* Wed Apr 08 2009 lslezak@suse.cz
+- Slideshow fixes - display additional rpm output in the
+ installation log, use installation log summary instead of
+ non-existing y2logRPM file (bnc#456446)
+- Avoid division by zero when total size to install is less than
+ 1024B (converted to 0kB)
+* Fri Apr 03 2009 locilka@suse.cz
+- Adjusting initial repository name according to LABEL in content
+ file. Exporting the same function for Add-Ons (bnc #481828).
+- 2.18.4
+* Mon Mar 30 2009 lslezak@suse.cz
+- sw_single - display the installation summary when there is
+ something to install/remove at start (bnc#465194)
* Tue Mar 17 2009 lslezak@suse.cz
- Removed ZMD synchronization option, ZMD cannot sychronize
all libzypp repositories (bnc#480845)
@@ -1918,7 +1937,7 @@
- Fixed a false timeout when calling rug (#165821).
- Really increased the rug timeout (#165145#c11).
- 2.13.89
-* Tue Apr 18 2006 jsrain@suse.de
+* Wed Apr 19 2006 jsrain@suse.de
- inform in the log that installation was aborted (#157322)
- 2.13.88
* Tue Apr 18 2006 jsrain@suse.de
@@ -2101,7 +2120,7 @@
* Mon Mar 20 2006 locilka@suse.cz
- proper handling with data returned from Pkg::TargetGetDU()
boolean -> integer (#159463)
-* Thu Mar 16 2006 jsrain@suse.de
+* Fri Mar 17 2006 jsrain@suse.de
- provide function to initialize installation sources with
visual feedback
- 2.13.47
@@ -2121,7 +2140,7 @@
* Tue Mar 14 2006 visnov@suse.cz
- disable sources on the target system for upgrade (#154850)
- 2.13.44
-* Mon Mar 13 2006 jsrain@suse.de
+* Tue Mar 14 2006 jsrain@suse.de
- do not report void error during installation after reboot
- fixed encodign the URL options (#155428)
- 2.13.43
@@ -2174,7 +2193,7 @@
* Fri Feb 24 2006 jsuchome@suse.cz
- added dialogs for ISO installation source
- 2.13.34
-* Thu Feb 23 2006 jsrain@suse.de
+* Fri Feb 24 2006 jsrain@suse.de
- add support for patterns to proposal routines
- 2.13.33
* Wed Feb 22 2006 jsrain@suse.de
@@ -2703,7 +2722,7 @@
* Mon Aug 23 2004 sh@suse.de
- V 2.10.5
- Replace &imagedir; with slide_pic_path in slide show
-* Fri Aug 20 2004 sh@suse.de
+* Sat Aug 21 2004 sh@suse.de
- V 2.10.4
- First version (in CVS HEAD) with new slide show
* Wed Aug 18 2004 nashif@suse.de
@@ -3241,7 +3260,7 @@
* Wed Sep 11 2002 kkaempf@suse.de
- drop argument "beginner" in calling sw_single
- 2.6.41
-* Tue Sep 10 2002 kkaempf@suse.de
+* Wed Sep 11 2002 kkaempf@suse.de
- full source media manager (cschum@suse.de)
- show failed packages or full log after PackageInstallation
- 2.6.40
@@ -3319,7 +3338,7 @@
* Thu Aug 29 2002 kkaempf@suse.de
- activate selections before entering package manager (#18501)
- show all selected selections in proposal (#18523)
-* Wed Aug 28 2002 kkaempf@suse.de
+* Thu Aug 29 2002 kkaempf@suse.de
- Add directory to Url if not given by linuxrc
- 2.6.18
* Wed Aug 28 2002 kkaempf@suse.de
++++++ yast2-packager-2.18.3.tar.bz2 -> yast2-packager-2.18.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/configure new/yast2-packager-2.18.5/configure
--- old/yast2-packager-2.18.3/configure 2009-03-17 19:50:12.000000000 +0100
+++ new/yast2-packager-2.18.5/configure 2009-04-10 17:36:48.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-packager 2.18.3.
+# Generated by GNU Autoconf 2.63 for yast2-packager 2.18.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.18.3'
-PACKAGE_STRING='yast2-packager 2.18.3'
+PACKAGE_VERSION='2.18.5'
+PACKAGE_STRING='yast2-packager 2.18.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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.18.3 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.18.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.18.3:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.18.5:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.18.3
+yast2-packager configure 2.18.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,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.18.3, which was
+It was created by yast2-packager $as_me 2.18.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.18.3'
+ VERSION='2.18.5'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.3"
+VERSION="2.18.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3451,7 +3451,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.18.3, which was
+This file was extended by yast2-packager $as_me 2.18.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-packager config.status 2.18.3
+yast2-packager config.status 2.18.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/configure.in new/yast2-packager-2.18.5/configure.in
--- old/yast2-packager-2.18.3/configure.in 2009-03-17 19:50:08.000000000 +0100
+++ new/yast2-packager-2.18.5/configure.in 2009-04-10 17:36:43.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.18.3, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.18.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.18.3"
+VERSION="2.18.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/Makefile.am new/yast2-packager-2.18.5/Makefile.am
--- old/yast2-packager-2.18.3/Makefile.am 2009-03-17 19:50:08.000000000 +0100
+++ new/yast2-packager-2.18.5/Makefile.am 2009-04-10 17:36:43.000000000 +0200
@@ -35,7 +35,7 @@
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/Makefile.in new/yast2-packager-2.18.5/Makefile.in
--- old/yast2-packager-2.18.3/Makefile.in 2009-03-17 19:50:14.000000000 +0100
+++ new/yast2-packager-2.18.5/Makefile.in 2009-04-10 17:36:50.000000000 +0200
@@ -229,7 +229,7 @@
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/src/clients/repositories.ycp new/yast2-packager-2.18.5/src/clients/repositories.ycp
--- old/yast2-packager-2.18.3/src/clients/repositories.ycp 2009-03-17 19:50:03.000000000 +0100
+++ new/yast2-packager-2.18.5/src/clients/repositories.ycp 2009-04-10 17:36:37.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 56190 2009-03-17 18:50:02Z lslezak $
+ * $Id: repositories.ycp 56760 2009-04-10 15:36:36Z lslezak $
*
*/
@@ -969,7 +969,32 @@
url = SourceDialogs::EditPopupType(url, plaindir);
if ( size( url ) == 0 ) break;
- if (url != old_url || plaindir != SourceDialogs::IsPlainDir())
+
+ boolean same_url = (url == old_url);
+
+ // special check for cd:// and dvd:// repositories
+ if (!same_url)
+ {
+ map new_url_parsed = URL::Parse(url);
+ map old_url_parsed = URL::Parse(old_url);
+
+ string new_url_scheme = tolower(new_url_parsed["scheme"]:"");
+ string old_url_scheme = tolower(old_url_parsed["scheme"]:"");
+
+ // ignore cd:// <-> dvd:// changes if the path is not changed
+ if ((new_url_scheme == "cd" || new_url_scheme == "dvd")
+ && (old_url_scheme == "cd" || old_url_scheme == "dvd"))
+ {
+ // compare only directories, ignore e.g. ?device=/dev/sr0 options
+ if (new_url_parsed["path"]:"" == old_url_parsed["path"]:"")
+ {
+ Pkg::SourceChangeUrl(sourceState[ "SrcId" ]:-1, url);
+ same_url = true;
+ }
+ }
+ }
+
+ if (!same_url || plaindir != SourceDialogs::IsPlainDir())
{
y2milestone ("URL or plaindir flag changed, recreating the source");
// copy the refresh flag
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/src/clients/sw_single.ycp new/yast2-packager-2.18.5/src/clients/sw_single.ycp
--- old/yast2-packager-2.18.3/src/clients/sw_single.ycp 2009-01-23 13:45:45.000000000 +0100
+++ new/yast2-packager-2.18.5/src/clients/sw_single.ycp 2009-04-08 11:14:05.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 54940 2009-01-23 12:45:44Z lslezak $
+ * $Id: sw_single.ycp 56678 2009-04-08 09:14:05Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -310,7 +310,7 @@
return !max_is_installed;
}
- map GetPackagerOptions()
+ map GetPackagerOptions()
{
// defaults
symbol mode = nil;
@@ -340,16 +340,18 @@
// use default parameters for missing or invalid values
if (mode == nil)
{
- mode = `searchMode;
+ // use summary mode if there is something to install (probably a suggested or recommended package) (bnc#465194)
+ Pkg::PkgSolve(true); // select the packages
+ mode = (Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove)) ? `summaryMode : `searchMode;
}
if (repo_management == nil)
{
repo_management = Mode::normal();
}
- map ret = $[ "dialog_type" : mode, "repo_mgmt" : repo_management ];
+ map ret = $[ "mode" : mode, "repo_mgmt" : repo_management ];
- y2milestone("inst_packages config: %1", ret);
+ y2milestone("PackagesUI::RunPackageSelector() options: %1", ret);
return ret;
}
@@ -399,6 +401,9 @@
do
{
+ // reset summary
+ PackagesUI::ResetPackageSummary();
+
force_restart = false;
list<string> old_failed_packs = [];
@@ -426,10 +431,10 @@
// names of taboo packages
list<string> taboo_packages = Pkg::GetPackages(`taboo, true);
- map opts = GetPackagerOptions();
+ map opts = GetPackagerOptions();
y2milestone("Using packager widget options: %1", opts);
- result = (symbol)WFM::CallFunction( "inst_packages", [opts]); // No: ask user via package selection widget
+ result = PackagesUI::RunPackageSelector(opts); // No: ask user via package selection widget
y2milestone ("inst_packages returns %1", result);
if (result == `accept)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/src/modules/PackageInstallation.ycp new/yast2-packager-2.18.5/src/modules/PackageInstallation.ycp
--- old/yast2-packager-2.18.3/src/modules/PackageInstallation.ycp 2009-01-23 13:45:45.000000000 +0100
+++ new/yast2-packager-2.18.5/src/modules/PackageInstallation.ycp 2009-04-08 11:14:05.000000000 +0200
@@ -3,7 +3,7 @@
*
* Authors: Gabriele Strattner
*
- * $Id: PackageInstallation.ycp 54940 2009-01-23 12:45:44Z lslezak $
+ * $Id: PackageInstallation.ycp 56678 2009-04-08 09:14:05Z lslezak $
*
*/
@@ -162,9 +162,9 @@
list<string> errpacks = (list<string>) (commit_result[1]:[]);
if (size (errpacks) > 0)
{
- string full_log = (string) SCR::Read (.target.string, Installation::destdir +
- Directory::logdir + "/y2logRPM");
+ string full_log = PackagesUI::GetPackageSummary()["install_log"]:"";
ShowFailedPackages (mergestring (errpacks, "\n"), full_log);
+
list<string> old_failed_packs = [];
if ((integer)SCR::Read (.target.size,
"/var/lib/YaST2/failed_packages") > 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/src/modules/PackageSlideShow.ycp new/yast2-packager-2.18.5/src/modules/PackageSlideShow.ycp
--- old/yast2-packager-2.18.3/src/modules/PackageSlideShow.ycp 2009-01-23 13:49:49.000000000 +0100
+++ new/yast2-packager-2.18.5/src/modules/PackageSlideShow.ycp 2009-04-08 11:05:56.000000000 +0200
@@ -785,7 +785,15 @@
**/
void UpdateTotalProgress(boolean silent_check)
{
- SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / ( total_size_to_install >> 10 ), nil /*, SlideShow::GetProgressLabel()*/ );
+ integer total_size_to_install_kB = total_size_to_install >> 10;
+
+ // avoid division by zero
+ if (total_size_to_install_kB <= 0)
+ {
+ total_size_to_install_kB = 1;
+ }
+
+ SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ );
UpdateCurrentCdProgress(silent_check);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.18.3/src/modules/Packages.ycp new/yast2-packager-2.18.5/src/modules/Packages.ycp
--- old/yast2-packager-2.18.3/src/modules/Packages.ycp 2009-01-28 17:13:21.000000000 +0100
+++ new/yast2-packager-2.18.5/src/modules/Packages.ycp 2009-04-03 14:38:02.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 55128 2009-01-28 16:13:20Z lslezak $
+ * $Id: Packages.ycp 56620 2009-04-03 12:33:08Z locilka $
*/
{
@@ -1345,6 +1345,81 @@
return true;
}
+/**
+ * Adjusts repository name according to LABEL in content file
+ * or a first product found on the media (as a fallback).
+ *
+ * @param integer repository ID
+ * @return boolean if successful
+ *
+ * @see BNC #481828
+ */
+global boolean AdjustSourcePropertiesAccordingToProduct (integer src_id) {
+ // This function is used from several places (also YaST Add-On)
+
+ if (src_id == nil || src_id < 0) {
+ y2error ("Wrong source ID: %1", src_id);
+ return nil;
+ }
+
+ y2milestone ("Trying to adjust repository name for: %1", src_id);
+ string new_name = nil;
+
+ // At first, try LABEL from content file
+ string contentfile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true /* optional */);
+ if (contentfile != nil) {
+ map contentmap = (map) SCR::Read (.content_file, contentfile);
+ if (haskey (contentmap, "LABEL") && contentmap["LABEL"]:nil != nil && contentmap["LABEL"]:"" != "") {
+ new_name = contentmap["LABEL"]:"";
+
+ if (regexpmatch (new_name, "^\[ \t\]\+"))
+ new_name = regexpsub (new_name, "^\[ \t\]\+(.*)", "\\1");
+ if (regexpmatch (new_name, "\[ \t\]\+$"))
+ new_name = regexpsub (new_name, "(.*)\[ \t\]\+$", "\\1");
+
+ y2milestone ("Using LABEL from content file: %1", new_name);
+ } else {
+ y2warning ("No (useful) LABEL in product content file");
+ }
+ }
+
+ // As a fallback,
+ if (new_name == nil || new_name == "") {
+ y2milestone ("Trying to get repository name from products");
+ list