Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Nov 7 15:55:26 CET 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-11-06 10:29:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-11-07 15:45:27.040150000 +0100
@@ -1,0 +2,25 @@
+Fri Nov 7 14:58:14 CET 2008 - lslezak@suse.cz
+
+- Pkg::SourceProvideSignedFile() has been renamed to
+ Pkg::SourceProvideDigestedFile(), added new
+ Pkg::SourceProvideSignedFile() to dowload signed files (like
+ "/content") (bnc#409927)
+- 2.17.25
+
+-------------------------------------------------------------------
+Fri Nov 7 12:54:54 CET 2008 - lslezak@suse.cz
+
+- Pkg::SourceProvideSignedFile() - the path may be relative,
+ it's changed to absolute automatically (bnc#409927)
+- Pkg::SourceProbe() - do not log the password in the URL
+ (bnc#441944)
+- 2.17.24
+
+-------------------------------------------------------------------
+Fri Nov 7 10:19:26 CET 2008 - lslezak@suse.cz
+
+- fixed network detection - removed unreliable IPv6 network test
+ (bnc#439068)
+- 2.17.23
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-pkg-bindings-2.17.22.tar.bz2
New:
----
yast2-pkg-bindings-2.17.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.i31642/_old 2008-11-07 15:55:15.000000000 +0100
+++ /var/tmp/diff_new_pack.i31642/_new 2008-11-07 15:55:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.22)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.17.22
+Version: 2.17.25
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.22.tar.bz2
+Source0: yast2-pkg-bindings-2.17.25.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
@@ -45,7 +45,7 @@
Ladislav Slez�k
%prep
-%setup -n yast2-pkg-bindings-2.17.22
+%setup -n yast2-pkg-bindings-2.17.25
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.i31642/_old 2008-11-07 15:55:15.000000000 +0100
+++ /var/tmp/diff_new_pack.i31642/_new 2008-11-07 15:55:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.17.22)
+# spec file for package yast2-pkg-bindings (Version 2.17.25)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings
-Version: 2.17.22
+Version: 2.17.25
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.22.tar.bz2
+Source0: yast2-pkg-bindings-2.17.25.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 5.10.0
@@ -47,7 +47,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.17.22
+%setup -n yast2-pkg-bindings-2.17.25
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -79,6 +79,22 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Fri Nov 07 2008 lslezak@suse.cz
+- Pkg::SourceProvideSignedFile() has been renamed to
+ Pkg::SourceProvideDigestedFile(), added new
+ Pkg::SourceProvideSignedFile() to dowload signed files (like
+ "/content") (bnc#409927)
+- 2.17.25
+* Fri Nov 07 2008 lslezak@suse.cz
+- Pkg::SourceProvideSignedFile() - the path may be relative,
+ it's changed to absolute automatically (bnc#409927)
+- Pkg::SourceProbe() - do not log the password in the URL
+ (bnc#441944)
+- 2.17.24
+* Fri Nov 07 2008 lslezak@suse.cz
+- fixed network detection - removed unreliable IPv6 network test
+ (bnc#439068)
+- 2.17.23
* Thu Nov 06 2008 lslezak@suse.cz
- return more data (URL lists) in Pkg::SourceProductData()
(bnc#441917)
++++++ yast2-pkg-bindings-2.17.22.tar.bz2 -> yast2-pkg-bindings-2.17.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/configure new/yast2-pkg-bindings-2.17.25/configure
--- old/yast2-pkg-bindings-2.17.22/configure 2008-11-06 10:30:27.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.25/configure 2008-11-07 15:44:53.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.17.22.
+# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.17.25.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.17.22'
-PACKAGE_STRING='yast2-pkg-bindings 2.17.22'
+PACKAGE_VERSION='2.17.25'
+PACKAGE_STRING='yast2-pkg-bindings 2.17.25'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1536,7 +1536,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.17.22 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.17.25 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1608,7 +1608,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.22:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.25:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.17.22
+yast2-pkg-bindings configure 2.17.25
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1734,7 +1734,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.17.22, which was
+It was created by yast2-pkg-bindings $as_me 2.17.25, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2581,7 +2581,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.17.22'
+ VERSION='2.17.25'
cat >>confdefs.h <<_ACEOF
@@ -2805,7 +2805,7 @@
-VERSION="2.17.22"
+VERSION="2.17.25"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -17209,7 +17209,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.17.22, which was
+This file was extended by yast2-pkg-bindings $as_me 2.17.25, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17272,7 +17272,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.17.22
+yast2-pkg-bindings config.status 2.17.25
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-pkg-bindings-2.17.22/configure.in new/yast2-pkg-bindings-2.17.25/configure.in
--- old/yast2-pkg-bindings-2.17.22/configure.in 2008-11-06 10:30:13.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.25/configure.in 2008-11-07 15:44:38.000000000 +0100
@@ -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-pkg-bindings, 2.17.22, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.17.25, http://bugs.opensuse.org/, yast2-pkg-bindings)
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.22"
+VERSION="2.17.25"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/src/Network.cc new/yast2-pkg-bindings-2.17.25/src/Network.cc
--- old/yast2-pkg-bindings-2.17.22/src/Network.cc 2008-10-17 10:58:32.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.25/src/Network.cc 2008-11-07 11:13:02.000000000 +0100
@@ -50,13 +50,6 @@
int result = ::system("ip addr|grep -v '127.0.0\\|inet6'|grep -q inet &> /dev/null");
y2milestone("Network is running: %s", (result == 0) ? "yes" : "no");
- if (!result)
- {
- // IPv4 not detected, try IPv6
- result = ::system("ip addr|grep -v 'inet6 ::1\\|inet6 fe80'|grep -q inet6 &> /dev/null");
- y2milestone("Network (IPv6) is running: %s", (result == 0) ? "yes" : "no");
- }
-
return !result;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/src/PkgFunctions.h new/yast2-pkg-bindings-2.17.25/src/PkgFunctions.h
--- old/yast2-pkg-bindings-2.17.22/src/PkgFunctions.h 2008-10-23 06:59:56.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.25/src/PkgFunctions.h 2008-11-07 15:18:38.000000000 +0100
@@ -218,7 +218,8 @@
* provides SourceProvideFile and SourceProvideFileCommon
*/
YCPValue SourceProvideFileCommon(const YCPInteger &id, const YCPInteger &mid,
- const YCPString& f, const bool optional, const bool check_signatures);
+ const YCPString& f, const bool optional, const bool check_signatures,
+ const bool digested);
public:
// general
/* TYPEINFO: void() */
@@ -501,6 +502,8 @@
YCPValue SourceProvideSignedDirectory(const YCPInteger& id, const YCPInteger& mid, const YCPString& d, const YCPBoolean &optional, const YCPBoolean &recursive);
/* TYPEINFO: string(integer,integer,string,boolean)*/
YCPValue SourceProvideSignedFile(const YCPInteger& id, const YCPInteger& mid, const YCPString& f, const YCPBoolean &optional);
+ /* TYPEINFO: string(integer,integer,string,boolean)*/
+ YCPValue SourceProvideDigestedFile(const YCPInteger& id, const YCPInteger& mid, const YCPString& f, const YCPBoolean &optional);
/* TYPEINFO: boolean(string)*/
YCPValue SourceCacheCopyTo (const YCPString&);
/* TYPEINFO: boolean(boolean)*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/src/Source_Create.cc new/yast2-pkg-bindings-2.17.25/src/Source_Create.cc
--- old/yast2-pkg-bindings-2.17.22/src/Source_Create.cc 2008-09-24 11:01:26.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.25/src/Source_Create.cc 2008-11-07 13:00:07.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Create.cc 51438 2008-09-24 09:01:25Z lslezak $
+ File: $Id: Source_Create.cc 53054 2008-11-07 11:57:59Z lslezak $
Author: Ladislav Slezák
Summary: Functions related to repository registration
Namespace: Pkg
@@ -774,13 +774,13 @@
**/
YCPValue PkgFunctions::RepositoryProbe(const YCPString& url, const YCPString& prod_dir)
{
- y2milestone("Probing repository type: '%s'...", url->value().c_str());
zypp::RepoManager repomanager = CreateRepoManager();
std::string ret;
try
{
zypp::Url probe_url(url->value());
+ y2milestone("Probing repository type: '%s'...", probe_url.asString().c_str());
// add the product directory
std::string prod = prod_dir->value();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/src/Source_Download.cc new/yast2-pkg-bindings-2.17.25/src/Source_Download.cc
--- old/yast2-pkg-bindings-2.17.22/src/Source_Download.cc 2008-11-03 16:00:32.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.25/src/Source_Download.cc 2008-11-07 15:44:26.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Download.cc 52835 2008-11-03 14:59:03Z lslezak $
+ File: $Id: Source_Download.cc 53069 2008-11-07 14:42:16Z lslezak $
Author: Ladislav Slezák
Summary: Functions for downloading files from a repository
Namespace: Pkg
@@ -44,7 +44,8 @@
const YCPInteger &mid,
const YCPString& f,
const bool optional,
- const bool check_signatures)
+ const bool check_signatures,
+ const bool digested)
{
if (id.isNull() || mid.isNull() || f.isNull())
{
@@ -76,14 +77,31 @@
{
// use a Fetcher for downloading signed files (see bnc#409927)
zypp::Fetcher fch;
- zypp::OnMediaLocation mloc(f->value(), mid->value());
+
+ // path - add "/" to the beginning if it's missing there
+ std::string media_path(f->value());
+ if (media_path.size() >= 1 && media_path[0] != '/')
+ {
+ media_path = "/" + media_path;
+ }
+
+ zypp::OnMediaLocation mloc(media_path, mid->value());
zypp::filesystem::TmpDir tmpdir;
// keep a reference to the tmpdir so the directory is not deleted at the and of the block
tmp_dirs.push_back(tmpdir);
path = tmpdir.path();
fch.setOptions(zypp::Fetcher::AutoAddIndexes);
- fch.enqueueDigested(mloc);
+
+ if (digested)
+ {
+ fch.enqueueDigested(mloc);
+ }
+ else
+ {
+ fch.addIndex(mloc);
+ }
+
fch.start(path, *repo->mediaAccess()); // uses MediaAccess to retrieve
fch.reset();
path = tmpdir.path() / f->value();
@@ -138,7 +156,7 @@
YCPValue
PkgFunctions::SourceProvideFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
- return SourceProvideFileCommon(id, mid, f, false /*optional*/, false /* signed */);
+ return SourceProvideFileCommon(id, mid, f, false /*optional*/, false /* signed */, true /* digested, doesn't matter in this case*/);
}
/****************************************************************************************
@@ -158,7 +176,7 @@
YCPValue
PkgFunctions::SourceProvideOptionalFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
- return SourceProvideFileCommon(id, mid, f, true /*optional*/, false /* signed */);
+ return SourceProvideFileCommon(id, mid, f, true /*optional*/, false /* signed */, true /* digested, doesn't matter in this case*/);
}
/****************************************************************************************
@@ -184,10 +202,36 @@
return YCPVoid();
}
- return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */);
+ return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */, false /* not digested = signed*/);
}
/****************************************************************************************
+ * @builtin SourceProvideDigestedFile
+ *
+ * @short Make a digested file available at the local filesystem
+ * @description
+ * Make a signed Let an InstSrc provide some file (make it available at the local filesystem).
+ * The checksum is stored either in /content file or in SHA1SUMS file.
+ *
+ * @param integer id Source ID
+ * @param integer mid Number of the media the file is located on ('1' for the 1st media).
+ * @param string f Filename relative to the media root.
+ * @param boolean optional true if the file can be missing on the medium, if an optional file doesn't exist do not ask user for another medium and return nil.
+ *
+ * @return string local path as string
+ **/
+YCPValue
+PkgFunctions::SourceProvideDigestedFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f, const YCPBoolean &optional)
+{
+ if (optional.isNull())
+ {
+ y2error("SourceProvideDigestedFile: argument 'optional' is nil!");
+ return YCPVoid();
+ }
+
+ return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */, true /* digested */);
+}
+/****************************************************************************************
* @builtin SourceProvideDir
* @short make a directory available at the local filesystem
* @description
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.22/VERSION new/yast2-pkg-bindings-2.17.25/VERSION
--- old/yast2-pkg-bindings-2.17.22/VERSION 2008-11-06 10:13:01.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.25/VERSION 2008-11-07 15:30:03.000000000 +0100
@@ -1 +1 @@
-2.17.22
+2.17.25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org