Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Sep 26 16:59:04 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-09-25 15:01:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-09-26 15:33:39.907438000 +0200
@@ -1,0 +2,13 @@
+Fri Sep 26 10:21:04 CEST 2008 - lslezak@suse.cz
+
+- do not use obsoleted Pkg::TargetLogfile() function (bnc#429954)
+- inst_kickoff.ycp - remove nonexisting directories from /etc/mtab
+ (bnc#425464)
+- 2.17.21
+
+-------------------------------------------------------------------
+Thu Sep 25 17:29:08 CEST 2008 - lslezak@suse.cz
+
+- fixed broken tag in a richtext string (bnc#429850)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.17.20.tar.bz2
New:
----
yast2-packager-2.17.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.s30040/_old 2008-09-26 16:58:51.000000000 +0200
+++ /var/tmp/diff_new_pack.s30040/_new 2008-09-26 16:58:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.20)
+# spec file for package yast2-packager (Version 2.17.21)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.20
+Version: 2.17.21
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.20.tar.bz2
+Source0: yast2-packager-2.17.21.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
@@ -79,7 +79,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.20
+%setup -n yast2-packager-2.17.21
%build
%{prefix}/bin/y2tool y2autoconf
@@ -115,6 +115,13 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Sep 26 2008 lslezak@suse.cz
+- do not use obsoleted Pkg::TargetLogfile() function (bnc#429954)
+- inst_kickoff.ycp - remove nonexisting directories from /etc/mtab
+ (bnc#425464)
+- 2.17.21
+* Thu Sep 25 2008 lslezak@suse.cz
+- fixed broken tag in a richtext string (bnc#429850)
* Thu Sep 25 2008 lslezak@suse.cz
- check signatures when downloading the slideshow (bnc#409927)
- AddOnProduct.ycp - fixed GPG callbacks prototypes (bnc#370223)
++++++ yast2-packager-2.17.20.tar.bz2 -> yast2-packager-2.17.21.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/configure new/yast2-packager-2.17.21/configure
--- old/yast2-packager-2.17.20/configure 2008-09-25 15:00:09.000000000 +0200
+++ new/yast2-packager-2.17.21/configure 2008-09-26 15:32:49.000000000 +0200
@@ -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.17.20.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.21.
#
# 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.17.20'
-PACKAGE_STRING='yast2-packager 2.17.20'
+PACKAGE_VERSION='2.17.21'
+PACKAGE_STRING='yast2-packager 2.17.21'
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.17.20 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.21 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.17.20:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.21:";;
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.17.20
+yast2-packager configure 2.17.21
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.17.20, which was
+It was created by yast2-packager $as_me 2.17.21, 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.17.20'
+ VERSION='2.17.21'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.20"
+VERSION="2.17.21"
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.17.20, which was
+This file was extended by yast2-packager $as_me 2.17.21, 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.17.20
+yast2-packager config.status 2.17.21
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.17.20/configure.in new/yast2-packager-2.17.21/configure.in
--- old/yast2-packager-2.17.20/configure.in 2008-09-25 15:00:05.000000000 +0200
+++ new/yast2-packager-2.17.21/configure.in 2008-09-26 15:32:44.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.20, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.21, 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.17.20"
+VERSION="2.17.21"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/src/clients/inst_custom_packages.ycp new/yast2-packager-2.17.21/src/clients/inst_custom_packages.ycp
--- old/yast2-packager-2.17.20/src/clients/inst_custom_packages.ycp 2008-09-04 11:02:39.000000000 +0200
+++ new/yast2-packager-2.17.21/src/clients/inst_custom_packages.ycp 2008-09-26 10:19:36.000000000 +0200
@@ -71,7 +71,6 @@
SlideShow::OpenDialog();
import "PackageInstallation";
- Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM");
integer oldvmlinuzsize = (integer) SCR::Read(.target.size, "/boot/vmlinuz");
list commit_result = PackageInstallation::CommitPackages (0, 0); // Y: commit them !
integer newvmlinuzsize = (integer) SCR::Read(.target.size, "/boot/vmlinuz");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/src/clients/inst_kickoff.ycp new/yast2-packager-2.17.21/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.17.20/src/clients/inst_kickoff.ycp 2008-07-22 07:50:10.000000000 +0200
+++ new/yast2-packager-2.17.21/src/clients/inst_kickoff.ycp 2008-09-26 12:07:12.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Do various tasks before starting with installation of rpms.
*
- * $Id: inst_kickoff.ycp 49172 2008-07-16 12:45:46Z jsrain $
+ * $Id: inst_kickoff.ycp 51568 2008-09-26 10:07:11Z lslezak $
*
*/
@@ -61,12 +61,42 @@
* need it.
*/
define void fake_mtab () ``{
+ y2milestone("Copying /etc/mtab to the target system...");
string tmpdir = (string) SCR::Read (.target.tmpdir);
string mtabname = "/etc/mtab";
string mtab = (string) WFM::Read(.local.string, mtabname);
+ // remove non-existing mount points
+ list<string> mtab_lines = splitstring(mtab, "\n");
+
+ mtab_lines = filter(string mtab_line, mtab_lines,
+ {
+ // parse the line, get the directory name
+ string dir = regexpsub(mtab_line, "^[^ \t]+[ \t]+([^ \t]*)[ \t]+", "\\1");
+
+ if (dir != nil)
+ {
+ // check if the directory exists
+ y2debug("Checking directory %1", dir);
+
+ integer exit_status = (integer)WFM::Execute(.local.bash, sformat("ls -d '%1'", String::Quote(dir)));
+ if (exit_status != 0)
+ {
+ y2warning("Excluding nonexisting directory %1", dir);
+ return false;
+ }
+ }
+
+ return true;
+ }
+ );
+
+ // join back the lines
+ mtab = mergestring(mtab_lines, "\n");
+ y2milestone("Target /etc/mtab file: %1", mtab);
+
SCR::Write(.target.string, tmpdir + "/mtab", mtab);
SCR::Execute (.target.bash, "/bin/cat "
+ "'" + String::Quote (tmpdir + "/mtab") + "'"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.17.21/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.17.20/src/clients/inst_rpmcopy.ycp 2008-09-17 12:05:32.000000000 +0200
+++ new/yast2-packager-2.17.21/src/clients/inst_rpmcopy.ycp 2008-09-26 10:21:56.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 51207 2008-09-17 10:05:34Z lslezak $
+ * $Id: inst_rpmcopy.ycp 51562 2008-09-26 08:21:54Z lslezak $
*/
{
@@ -22,7 +22,6 @@
import "Mode";
import "Stage";
import "Installation";
- import "Directory";
import "Language";
import "PackageInstallation";
import "Packages";
@@ -382,9 +381,6 @@
SlideShow::OpenDialog ();
}
- Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM");
-
-
if (Mode::autoinst () && Stage::cont ()) {
AutoinstPostPackages();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/src/clients/sw_single.ycp new/yast2-packager-2.17.21/src/clients/sw_single.ycp
--- old/yast2-packager-2.17.20/src/clients/sw_single.ycp 2008-09-12 15:09:06.000000000 +0200
+++ new/yast2-packager-2.17.21/src/clients/sw_single.ycp 2008-09-26 10:21:56.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 51115 2008-09-12 13:09:05Z lslezak $
+ * $Id: sw_single.ycp 51562 2008-09-26 08:21:54Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -22,7 +22,6 @@
import "Arch";
import "Confirm";
import "Installation";
- import "Directory";
import "Mode";
import "PackageCallbacks";
import "PackageLock";
@@ -156,8 +155,6 @@
// if sw_single is called with an absolute package-pathname, there is no need to
// mount the source medium or check SuSE version or dependencies
- Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM");
-
PackageSlideShow::InitPkgData(true); // force reinitialization
foreach (string package, arg_list, {
@@ -552,7 +549,6 @@
SlideShow::MoveToStage( "packages" );
import "PackageInstallation";
- Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM");
integer oldvmlinuzsize = (integer) SCR::Read(.target.size, "/boot/vmlinuz");
list commit_result = PackageInstallation::CommitPackages (0, 0); // Y: commit them !
integer newvmlinuzsize = (integer) SCR::Read(.target.size, "/boot/vmlinuz");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/src/clients/webpin_package_search.ycp new/yast2-packager-2.17.21/src/clients/webpin_package_search.ycp
--- old/yast2-packager-2.17.20/src/clients/webpin_package_search.ycp 2008-09-10 11:43:59.000000000 +0200
+++ new/yast2-packager-2.17.21/src/clients/webpin_package_search.ycp 2008-09-25 17:28:44.000000000 +0200
@@ -74,7 +74,7 @@
ret = "<p>" + descr + version + archs + "</p>";
}
else
- ret = _("<p><b>No packages matching entered criteria were found</b><p>");
+ ret = _("<p><b>No packages matching entered criteria were found</b></p>");
UI::ChangeWidget(`id("description"),`Value, ret);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.20/VERSION new/yast2-packager-2.17.21/VERSION
--- old/yast2-packager-2.17.20/VERSION 2008-09-25 14:46:52.000000000 +0200
+++ new/yast2-packager-2.17.21/VERSION 2008-09-26 15:32:19.000000000 +0200
@@ -1 +1 @@
-2.17.20
+2.17.21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org