Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Tue May 9 22:57:10 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-28 15:15:18.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-09 18:34:46.000000000 +0200
@@ -1,0 +2,17 @@
+Tue May 9 18:23:51 CEST 2006 - visnov@suse.cz
+
+- Do not try to evaluate the same callback twice, the parameters
+ are discarded after the first call (#173291)
+- 2.13.70
+
+-------------------------------------------------------------------
+Tue May 9 18:06:39 CEST 2006 - mvidner@suse.cz
+
+- When creating a source, prefer an alias that may be passed as a
+ query parameter of the URL.
+ This is an adaptation for the new output of suseRegister-1.0-59,
+ ensuring proper synchronization of YaST and Zenworks for enterprise
+ updates (#158850#c17).
+- 2.13.69
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.68.tar.bz2
New:
----
yast2-pkg-bindings-2.13.70.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.yKSCxa/_old 2006-05-09 22:57:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yKSCxa/_new 2006-05-09 22:57:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.68)
+# spec file for package yast2-pkg-bindings (Version 2.13.70)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.68
+Version: 2.13.70
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.68.tar.bz2
+Source0: yast2-pkg-bindings-2.13.70.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.68
+%setup -n yast2-pkg-bindings-2.13.70
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,17 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Tue May 09 2006 - visnov@suse.cz
+- Do not try to evaluate the same callback twice, the parameters
+ are discarded after the first call (#173291)
+- 2.13.70
+* Tue May 09 2006 - mvidner@suse.cz
+- When creating a source, prefer an alias that may be passed as a
+ query parameter of the URL.
+ This is an adaptation for the new output of suseRegister-1.0-59,
+ ensuring proper synchronization of YaST and Zenworks for enterprise
+ updates (#158850#c17).
+- 2.13.69
* Fri Apr 28 2006 - lslezak@suse.cz
- fixed reset in PkgReset() and in ResolvableNeutral() builtin
(#170643)
++++++ yast2-pkg-bindings-2.13.68.tar.bz2 -> yast2-pkg-bindings-2.13.70.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/Makefile.am new/yast2-pkg-bindings-2.13.70/Makefile.am
--- old/yast2-pkg-bindings-2.13.68/Makefile.am 2006-04-28 15:14:43.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/Makefile.am 2006-04-28 14:59:42.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/Makefile.in new/yast2-pkg-bindings-2.13.70/Makefile.in
--- old/yast2-pkg-bindings-2.13.68/Makefile.in 2006-04-28 15:15:03.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/Makefile.in 2006-04-28 14:59:57.000000000 +0200
@@ -245,6 +245,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -274,7 +275,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -800,7 +801,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -821,7 +822,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -848,15 +849,15 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
@@ -903,12 +904,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/VERSION new/yast2-pkg-bindings-2.13.70/VERSION
--- old/yast2-pkg-bindings-2.13.68/VERSION 2006-04-28 15:12:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/VERSION 2006-05-09 18:25:04.000000000 +0200
@@ -1 +1 @@
-2.13.68
+2.13.70
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/configure new/yast2-pkg-bindings-2.13.70/configure
--- old/yast2-pkg-bindings-2.13.68/configure 2006-04-28 15:14:58.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/configure 2006-04-28 14:59:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.68.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.67.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.68'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.68'
+PACKAGE_VERSION='2.13.67'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.67'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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-pkg-bindings 2.13.68 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.67 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.68:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.67:";;
esac
cat <<\_ACEOF
@@ -1184,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.68
+yast2-pkg-bindings configure 2.13.67
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1198,7 +1198,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-pkg-bindings $as_me 2.13.68, which was
+It was created by yast2-pkg-bindings $as_me 2.13.67, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1928,7 +1928,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.68'
+ VERSION='2.13.67'
cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2139,7 @@
-VERSION="2.13.68"
+VERSION="2.13.67"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -20273,7 +20273,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-pkg-bindings $as_me 2.13.68, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.67, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20336,7 +20336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.68
+yast2-pkg-bindings config.status 2.13.67
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/configure.in new/yast2-pkg-bindings-2.13.70/configure.in
--- old/yast2-pkg-bindings-2.13.68/configure.in 2006-04-28 15:14:43.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/configure.in 2006-04-28 14:59:42.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.68, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.67, http://www.suse.de/feedback, yast2-pkg-bindings)
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.13.68"
+VERSION="2.13.67"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/pkg-bindings.pot new/yast2-pkg-bindings-2.13.70/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.13.68/pkg-bindings.pot 2006-03-27 16:52:32.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-27 16:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/Package.cc:1669 src/Package.cc:1729
-msgid "See /var/log/YaST2/badlist for more information."
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/src/Callbacks.cc new/yast2-pkg-bindings-2.13.70/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.68/src/Callbacks.cc 2006-04-25 13:30:15.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/src/Callbacks.cc 2006-05-09 18:23:37.000000000 +0200
@@ -434,8 +434,6 @@
callback.addInt( error );
callback.addStr( description );
callback.addStr( std::string() ); // FIXME: on error name, for OK, local path
- callback.evaluateStr(); // return value ignored by RpmDb
-
std::string ret = callback.evaluateStr();
// "R" = retry
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/src/Package.cc new/yast2-pkg-bindings-2.13.70/src/Package.cc
--- old/yast2-pkg-bindings-2.13.68/src/Package.cc 2006-04-28 13:46:35.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/src/Package.cc 2006-05-09 17:25:36.000000000 +0200
@@ -575,8 +575,7 @@
/**
- * helper function, install a package which provides tag (as a
- * package name, a provided tag, or a provided file
+ * helper function, install a resolvable with a specific name and kind
*/
bool
@@ -655,6 +654,8 @@
/**
* helper function, deinstall a kind which provides tag (as a
* kind name, a provided tag, or a provided file
+ *
+ * !!!!**** WARNING: This is different from DoProvideNameKind ****!!!!
*/
bool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.68/src/Source.cc new/yast2-pkg-bindings-2.13.70/src/Source.cc
--- old/yast2-pkg-bindings-2.13.68/src/Source.cc 2006-04-26 12:48:39.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.70/src/Source.cc 2006-05-09 18:23:48.000000000 +0200
@@ -782,6 +782,28 @@
return outstr;
}
+/**
+ * Take the ?alias=foo part of old_url, if any, and return it,
+ * putting the rest to new_url.
+ * \throws Exception on malformed URLs I guess
+ */
+static std::string removeAlias (const zypp::Url & old_url,
+ zypp::Url & new_url)
+{
+ std::string alias;
+ new_url = old_url;
+ zypp::url::ParamMap query = new_url.getQueryStringMap ();
+ zypp::url::ParamMap::iterator alias_it = query.find ("alias");
+ if (alias_it != query.end ())
+ {
+ alias = alias_it->second;
+ query.erase (alias_it);
+ new_url.setQueryStringMap (query);
+ }
+ return alias;
+}
+
+
/** Create a Source and immediately put it into the SourceManager.
* \return the SourceId
* \throws Exception if Source creation fails
@@ -791,27 +813,35 @@
const zypp::Pathname & path_r,
const bool base_source )
{
- zypp::Source_Ref newsrc = zypp::SourceFactory().createFrom(url_r, path_r, string(""), zypp::filesystem::Pathname(), base_source);
+ y2milestone ("Original URL: %s", url_r.asString().c_str());
+
+ // #158850#c17, if the URL contains an alias, we use that
+ zypp::Url new_url;
+ string alias = removeAlias (url_r, new_url);
+
+ zypp::Source_Ref newsrc = zypp::SourceFactory().createFrom(new_url, path_r, alias, zypp::filesystem::Pathname(), base_source);
- // use product name+edition as the alias
- // (URL is not enough for different sources in the same DVD drive)
- // alias must be unique, add timestamp
- zypp::ResStore products = newsrc.resolvables (zypp::Product::TraitsType::kind);
- zypp::ResStore::iterator
+ if (alias.empty ())
+ {
+ // use product name+edition as the alias
+ // (URL is not enough for different sources in the same DVD drive)
+ // alias must be unique, add timestamp
+ zypp::ResStore products = newsrc.resolvables (zypp::Product::TraitsType::kind);
+ zypp::ResStore::iterator
b = products.begin (),
e = products.end ();
- string alias;
- if (b != e)
- {
+ if (b != e)
+ {
zypp::ResObject::Ptr p = *b;
alias = p->name () + '-' + p->edition ().asString () + '-';
- }
- alias += timestamp ();
+ }
+ alias += timestamp ();
- newsrc.setAlias( alias );
+ newsrc.setAlias( alias );
+ }
zypp::SourceManager::SourceId id = zypp::SourceManager::sourceManager()->addSource( newsrc );
- y2milestone("Added source %lu: %s (alias %s)", id, (url_r.asString()+path_r.asString()).c_str(), alias.c_str() );
+ y2milestone("Added source %lu: %s %s (alias %s)", id, new_url.asString().c_str(), path_r.asString().c_str(), alias.c_str() );
return id;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...