Hello community,
here is the log from the commit of package yast2-cd-creator
checked in at Tue Apr 3 19:55:50 CEST 2007.
--------
--- yast2-cd-creator/yast2-cd-creator.changes 2007-03-12 12:13:39.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-cd-creator/yast2-cd-creator.changes 2007-04-02 15:22:02.906820000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 2 14:54:25 CEST 2007 - lslezak@suse.cz
+
+- register Pkg::CallbackSourceReportInit/Destroy() callbacks -
+ required after fix of bug #251726
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-cd-creator-2.15.3.tar.bz2
New:
----
yast2-cd-creator-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-cd-creator.spec ++++++
--- /var/tmp/diff_new_pack.q22045/_old 2007-04-03 19:55:20.000000000 +0200
+++ /var/tmp/diff_new_pack.q22045/_new 2007-04-03 19:55:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-cd-creator (Version 2.15.3)
+# spec file for package yast2-cd-creator (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-cd-creator
URL: http://www.suse.com/
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-cd-creator-2.15.3.tar.bz2
+Source0: yast2-cd-creator-2.15.4.tar.bz2
prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
BuildRequires: yast2 >= 2.15.2
@@ -44,7 +44,7 @@
Anas Nashif
%prep
-%setup -n yast2-cd-creator-2.15.3
+%setup -n yast2-cd-creator-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,10 @@
#%dir /etc/YaST2/cd-creator
%changelog
+* Mon Apr 02 2007 - lslezak@suse.cz
+- register Pkg::CallbackSourceReportInit/Destroy() callbacks -
+ required after fix of bug #251726
+- 2.15.4
* Mon Mar 12 2007 - locilka@suse.cz
- Added missing yast2-storage to RPM dependencies and BuildRequires
- 2.15.3
++++++ yast2-cd-creator-2.15.3.tar.bz2 -> yast2-cd-creator-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.15.3/configure new/yast2-cd-creator-2.15.4/configure
--- old/yast2-cd-creator-2.15.3/configure 2007-03-12 12:10:52.000000000 +0100
+++ new/yast2-cd-creator-2.15.4/configure 2007-04-02 15:18:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.15.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-cd-creator'
PACKAGE_TARNAME='yast2-cd-creator'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-cd-creator 2.15.3'
+PACKAGE_VERSION='2.15.4'
+PACKAGE_STRING='yast2-cd-creator 2.15.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-cd-creator 2.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-cd-creator 2.15.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-cd-creator 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-cd-creator 2.15.4:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-cd-creator configure 2.15.3
+yast2-cd-creator configure 2.15.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-cd-creator $as_me 2.15.3, which was
+It was created by yast2-cd-creator $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-cd-creator'
- VERSION='2.15.3'
+ VERSION='2.15.4'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-cd-creator"
MAINTAINER="Ladislav Slezak "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-cd-creator $as_me 2.15.3, which was
+This file was extended by yast2-cd-creator $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-cd-creator config.status 2.15.3
+yast2-cd-creator config.status 2.15.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.15.3/configure.in new/yast2-cd-creator-2.15.4/configure.in
--- old/yast2-cd-creator-2.15.3/configure.in 2007-03-12 12:10:47.000000000 +0100
+++ new/yast2-cd-creator-2.15.4/configure.in 2007-04-02 15:18:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-cd-creator, 2.15.3, http://bugs.opensuse.org/, yast2-cd-creator)
+AC_INIT(yast2-cd-creator, 2.15.4, http://bugs.opensuse.org/, yast2-cd-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-cd-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.15.3/src/CDCreator.ycp new/yast2-cd-creator-2.15.4/src/CDCreator.ycp
--- old/yast2-cd-creator-2.15.3/src/CDCreator.ycp 2007-01-16 12:48:46.000000000 +0100
+++ new/yast2-cd-creator-2.15.4/src/CDCreator.ycp 2007-04-02 15:16:43.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of cd-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: CDCreator.ycp 35254 2007-01-12 08:56:16Z lslezak $
+ * $Id: CDCreator.ycp 37269 2007-04-02 13:16:40Z lslezak $
*
* Representation of the configuration of cd-creator.
* Input and output routines.
@@ -693,6 +693,24 @@
return true;
}
+void RegisterCallbacks()
+{
+ Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart");
+ Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress");
+ Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd");
+ Pkg::CallbackSourceReportInit("CDCreator::CallbackSourceReportInit");
+ Pkg::CallbackSourceReportDestroy("CDCreator::CallbackSourceReportDestroy");
+}
+
+void UnregisterCallbacks()
+{
+ Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart");
+ Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress");
+ Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd");
+ Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit");
+ Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy");
+}
+
/**
* Create Skeleton
* @return boolean true on success
@@ -724,6 +742,8 @@
string descrDir = "";
string dataDir = "";
+ RegisterCallbacks();
+
if (Arch::i386() || Arch::x86_64())
{
if (Config["code10"]:false)
@@ -748,7 +768,10 @@
meta_local = ReadContentFile(source + "/content");
if (source == "")
+ {
+ UnregisterCallbacks();
return false;
+ }
y2milestone("source: %1", source);
descr_dir = this_source["productData","descrdir"]:"suse/setup/descr";
@@ -836,7 +859,10 @@
y2debug("source data: %1", this_source["sourceData", "url"]:"" );
success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir));
if (!success)
+ {
+ UnregisterCallbacks();
return false;
+ }
Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir));
@@ -1159,6 +1185,8 @@
// update MD5SUMS file
success = success && UpdateMD5File(sformat("%1/%2", skel_root, descrDir));
+ UnregisterCallbacks();
+
return success;
}
@@ -1646,6 +1674,15 @@
y2debug("source_id: %1, url: %2, task: %3, error: %4, reason: %5", numeric_id, url, task, error, reason);
}
+global void CallbackSourceReportInit()
+{
+ y2debug("CDCreator::CallbackSourceReportInit()");
+}
+
+global void CallbackSourceReportDestroy()
+{
+ y2debug("CDCreator::CallbackSourceReportDestroy()");
+}
/**
* CopyPackages()
@@ -1662,9 +1699,7 @@
boolean ret = true;
// disable source report callbacks - there is a progress dialog
- Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart");
- Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress");
- Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd");
+ RegisterCallbacks();
y2milestone("Package summary: %1", toCopy);
@@ -1723,9 +1758,7 @@
basedir)) == 0);
// restore the source report callbacks
- Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart");
- Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress");
- Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd");
+ UnregisterCallbacks();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.15.3/VERSION new/yast2-cd-creator-2.15.4/VERSION
--- old/yast2-cd-creator-2.15.3/VERSION 2007-03-12 12:09:41.000000000 +0100
+++ new/yast2-cd-creator-2.15.4/VERSION 2007-04-02 15:06:52.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org