Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Nov 6 22:37:20 CET 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-10-21 16:06:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-11-06 10:29:41.437961000 +0100
@@ -1,0 +2,25 @@
+Thu Nov 6 09:58:09 CET 2008 - lslezak@suse.cz
+
+- return more data (URL lists) in Pkg::SourceProductData()
+ (bnc#441917)
+- 2.17.22
+
+-------------------------------------------------------------------
+Mon Nov 3 14:52:43 CET 2008 - lslezak@suse.cz
+
+- use AutoIndexes zypp::Fetcher feature, fixed signed file
+ downloading (bnc#409927)
+
+-------------------------------------------------------------------
+Fri Oct 31 16:29:10 CET 2008 - lslezak@suse.cz
+
+- Pkg::ResolvableProperties() - return correct status for selected
+ patterns (bnc#440611)
+
+-------------------------------------------------------------------
+Thu Oct 23 09:41:39 CEST 2008 - lslezak@suse.cz
+
+- added Pkg::SourceProvideSignedFile() function for downloading
+ a single signed file (bnc#409927)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-pkg-bindings-2.17.21.tar.bz2
New:
----
yast2-pkg-bindings-2.17.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.AU4511/_old 2008-11-06 22:37:13.000000000 +0100
+++ /var/tmp/diff_new_pack.AU4511/_new 2008-11-06 22:37:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.21)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.22)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.17.21
+Version: 2.17.22
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.21.tar.bz2
+Source0: yast2-pkg-bindings-2.17.22.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.21
+%setup -n yast2-pkg-bindings-2.17.22
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
@@ -76,7 +76,6 @@
%dir %{prefix}/share/doc/packages/yast2-pkg-bindings
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README
-
%changelog
* Fri May 16 2008 lslezak@suse.cz
- documented lock API
@@ -85,7 +84,7 @@
- use repo name as mediaset label.
* Tue Mar 11 2008 coolo@suse.de
- devtools requires redudant prefix definition
-* Thu Mar 06 2008 coolo@suse.de
+* Wed Mar 05 2008 coolo@suse.de
- fixing spec file syntax
* Tue Dec 18 2007 lslezak@suse.cz
- updated generating of the documentation to the new source file
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.AU4511/_old 2008-11-06 22:37:13.000000000 +0100
+++ /var/tmp/diff_new_pack.AU4511/_new 2008-11-06 22:37:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.17.21)
+# spec file for package yast2-pkg-bindings (Version 2.17.22)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-pkg-bindings
-Version: 2.17.21
+Version: 2.17.22
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.21.tar.bz2
+Source0: yast2-pkg-bindings-2.17.22.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.21
+%setup -n yast2-pkg-bindings-2.17.22
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -78,8 +78,20 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so.*
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
-
%changelog
+* Thu Nov 06 2008 lslezak@suse.cz
+- return more data (URL lists) in Pkg::SourceProductData()
+ (bnc#441917)
+- 2.17.22
+* Mon Nov 03 2008 lslezak@suse.cz
+- use AutoIndexes zypp::Fetcher feature, fixed signed file
+ downloading (bnc#409927)
+* Fri Oct 31 2008 lslezak@suse.cz
+- Pkg::ResolvableProperties() - return correct status for selected
+ patterns (bnc#440611)
+* Thu Oct 23 2008 lslezak@suse.cz
+- added Pkg::SourceProvideSignedFile() function for downloading
+ a single signed file (bnc#409927)
* Tue Oct 21 2008 lslezak@suse.cz
- fixed ResolvableProperties() - correctly iterate over all
available/installed objects (bnc#436842)
@@ -351,7 +363,7 @@
- updated ProgressDownload callback - pass the current and the
average download rate (bnc#168935)
- 2.16.17
-* Thu Mar 06 2008 coolo@suse.de
+* Wed Mar 05 2008 coolo@suse.de
- reduce build requires
* Wed Mar 05 2008 lslezak@suse.cz
- added Pkg::CallbackStartRefresh() and Pkg::CallbackDoneRefresh()
@@ -610,7 +622,7 @@
removing a repo
- SourceLoad() - build repo cache if it's missing
- 2.15.27
-* Thu Jul 12 2007 jkupec@suse.cz
+* Wed Jul 11 2007 jkupec@suse.cz
- storing YRepo_Ptr instead of YRepo in the vector
- modified logFindRepository() to retrun YRepo_Ptr
check its return value:
@@ -933,7 +945,7 @@
- 2.13.76
* Wed May 17 2006 jsrain@suse.cz
- one more fix of reseting resolvable status (#175451)
-* Wed May 17 2006 ma@suse.de
+* Tue May 16 2006 ma@suse.de
- Adapt to libzypp-1.0.0
- 2.13.75
* Tue May 16 2006 mvidner@suse.cz
@@ -977,7 +989,7 @@
- select language packages in SetLocale(), handle the main locale
when processing additional locales (#162064)
- 2.13.65
-* Sat Apr 22 2006 jsrain@suse.de
+* Fri Apr 21 2006 jsrain@suse.de
- SourceCreateBase (#160585)
- 2.13.64
* Fri Apr 21 2006 lslezak@suse.cz
@@ -986,7 +998,7 @@
* Thu Apr 20 2006 lslezak@suse.cz
- fixed logging
- 2.13.62
-* Thu Apr 20 2006 jsrain@suse.de
+* Wed Apr 19 2006 jsrain@suse.de
- fixed building
- 2.13.61
* Wed Apr 19 2006 visnov@suse.cz
@@ -1017,9 +1029,9 @@
* Mon Apr 10 2006 visnov@suse.cz
- fix ImportGPGKey
- 2.13.54
-* Sat Apr 08 2006 jsrain@suse.de
+* Fri Apr 07 2006 jsrain@suse.de
- let product provide short_name via ResolvableProperties (#163702)
-* Fri Apr 07 2006 visnov@suse.cz
+* Thu Apr 06 2006 visnov@suse.cz
- fix build
- 2.13.52
* Thu Apr 06 2006 visnov@suse.cz
@@ -1083,7 +1095,7 @@
* Mon Mar 27 2006 lslezak@suse.cz
- remove all transactions in PkgTaboo, prevent from installing
unconfirmed packages (#160588)
-* Sun Mar 26 2006 jsrain@suse.de
+* Sat Mar 25 2006 jsrain@suse.de
- do not report repeated SourceStartManager as error
- 2.13.39
* Fri Mar 24 2006 visnov@suse.cz
@@ -1124,7 +1136,7 @@
* Thu Mar 16 2006 mvidner@suse.cz
- added Pkg::ResolvablePreselectPatches to select Needed items
- 2.13.29
-* Thu Mar 16 2006 kkaempf@suse.de
+* Wed Mar 15 2006 kkaempf@suse.de
- add PkgEstablish() to calculate needed/unneeded patches.
* Wed Mar 15 2006 visnov@suse.cz
- set alias when creating a source
@@ -1349,10 +1361,10 @@
- Removed obsolete 'TargetUpdateInf'. That's old YaST(1)
stuff.
- 2.12.6
-* Thu Aug 04 2005 ma@suse.de
+* Wed Aug 03 2005 ma@suse.de
- Added YCP {Start,Error,Done}SourceRefresh callbacks.
- 2.12.5
-* Thu Jul 28 2005 ma@suse.de
+* Wed Jul 27 2005 ma@suse.de
- Fixed conversion from YCPMap to InstSrcManager::SrcStateVector.
- 2.12.4
* Mon Jul 25 2005 ma@suse.de
++++++ yast2-pkg-bindings-2.17.21.tar.bz2 -> yast2-pkg-bindings-2.17.22.tar.bz2 ++++++
++++ 58341 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/config.h.in new/yast2-pkg-bindings-2.17.22/config.h.in
--- old/yast2-pkg-bindings-2.17.21/config.h.in 2008-10-21 16:02:35.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/config.h.in 2008-11-06 10:30:29.000000000 +0100
@@ -45,6 +45,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/configure.in new/yast2-pkg-bindings-2.17.22/configure.in
--- old/yast2-pkg-bindings-2.17.21/configure.in 2008-10-21 16:02:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/configure.in 2008-11-06 10:30:13.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
+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.21, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.17.22, 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.21"
+VERSION="2.17.22"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/src/Package.cc new/yast2-pkg-bindings-2.17.22/src/Package.cc
--- old/yast2-pkg-bindings-2.17.21/src/Package.cc 2008-10-21 15:35:25.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/src/Package.cc 2008-10-30 08:37:14.000000000 +0100
@@ -1505,54 +1505,57 @@
/**
* @builtin PkgUpdateAll
- * @param map update_options Options for the solver. All parameters are optional, if a parameter is missing the default value from the package manager (libzypp) is used. Currently supported options: <tt>$["silent_downgrades":boolean] </tt>
+ * @param map update_options Options for the solver. All parameters are optional,
+ * if a parameter is missing the default value from the package manager (libzypp) is used.
+ * Currently supported options: <tt>$["silent_downgrades":boolean] </tt>
+ *
* @short Update installed packages
* @description
* Mark all packages for installation which are installed and have
* an available candidate for update.
- *
+ *
* This will mark packages for installation *and* for deletion (if a
* package provides/obsoletes another package)
- *
+ *
* This function does not solve dependencies.
- *
+ *
* Symbols and integer values returned:
- *
+ *
* <b>ProblemListSze</b>: Number of taboo and dropped packages found.
- *
+ *
* <b>DeleteUnmaintained</b>: Whether delete_unmaintained arg was true or false.
* Dependent on this, <b>SumDropped</b> below either denotes packages to delete
* (if true) or packages to keep (if false).
- *
+ *
* <b>SumProcessed</b>: TOTAL number of installed packages we processed.
- *
+ *
* <b>SumToInstall</b>: TOTAL number of packages now tagged as to install.
* Summs <b>Ipreselected</b>, <b>Iupdate</b>, <b>Idowngrade</b>, <b>Ireplaced</b>.
- *
+ *
* <b>Ipreselected</b>: Packages which were already taged to install.
- *
+ *
* <b>Iupdate</b>: Packages set to install as update to a newer version.
- *
+ *
* <b>Idowngrade</b>: Packages set to install performing a version downgrade.
- *
+ *
* <b>Ireplaced</b>: Packages set to install as they replace an installed package.
- *
+ *
* <b>SumToDelete</b>: TOTAL number of packages now tagged as to delete.
* Summs <b>Dpreselected</b>, <b>SumDropped</b> if <b>DeleteUnmaintained</b>
* was set.
- *
+ *
* <b>Dpreselected</b>: Packages which were already taged to delete.
- *
+ *
* <b>SumToKeep</b>: TOTAL number of packages which remain unchanged.
* Summs <b>Ktaboo</b>, <b>Knewer</b>, <b>Ksame</b>, <b>SumDropped</b>
* if <b>DeleteUnmaintained</b> was not set.
- *
+ *
* <b>Ktaboo</b>: Packages which are set taboo.
- *
+ *
* <b>Knewer</b>: Packages kept because only older versions are available.
- *
+ *
* <b>Ksame</b>: Packages kept because they are up to date.
- *
+ *
* <b>SumDropped</b>: TOTAL number of dropped packages found. Dependent
* on the delete_unmaintained arg, they are either tagged as to delete or
* remain unchanged.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/src/PkgFunctions.h new/yast2-pkg-bindings-2.17.22/src/PkgFunctions.h
--- old/yast2-pkg-bindings-2.17.21/src/PkgFunctions.h 2008-10-21 15:35:09.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/src/PkgFunctions.h 2008-10-23 06:59:56.000000000 +0200
@@ -217,7 +217,8 @@
/**
* provides SourceProvideFile and SourceProvideFileCommon
*/
- YCPValue SourceProvideFileCommon (const YCPInteger&, const YCPInteger&, const YCPString&, const YCPBoolean&);
+ YCPValue SourceProvideFileCommon(const YCPInteger &id, const YCPInteger &mid,
+ const YCPString& f, const bool optional, const bool check_signatures);
public:
// general
/* TYPEINFO: void() */
@@ -498,6 +499,8 @@
YCPValue SourceProvideDirectory(const YCPInteger& id, const YCPInteger& mid, const YCPString& d, const YCPBoolean &optional, const YCPBoolean &recursive);
/* TYPEINFO: string(integer,integer,string,boolean,boolean)*/
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: boolean(string)*/
YCPValue SourceCacheCopyTo (const YCPString&);
/* TYPEINFO: boolean(boolean)*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.17.22/src/Resolvable_Properties.cc
--- old/yast2-pkg-bindings-2.17.21/src/Resolvable_Properties.cc 2008-10-21 15:55:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/src/Resolvable_Properties.cc 2008-11-06 09:42:57.000000000 +0100
@@ -53,7 +53,7 @@
YCPList ret;
for_( it, urls_r.begin(), urls_r.end() )
{
- ret->add( YCPString(it->asString()) );
+ ret->add( YCPString(it->asCompleteString()) );
}
return ret;
}
@@ -91,6 +91,7 @@
+ "extra_urls"
+ "optional_urls"
+ "register_urls"
+ + "relnotes_urls"
+ "smolt_urls"
+ "register_target"
+ "register_release"
@@ -194,7 +195,12 @@
zypp::ResStatus status = item.status();
- if (status.isInstalled() || status.isSatisfied())
+ if (status.isToBeInstalled())
+ {
+ stat = "selected";
+ info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue())));
+ }
+ else if (status.isInstalled() || status.isSatisfied())
{
if (status.isToBeUninstalled())
{
@@ -206,11 +212,6 @@
stat = "installed";
}
}
- else if (status.isToBeInstalled())
- {
- stat = "selected";
- info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue())));
- }
else
{
stat = "available";
@@ -293,12 +294,7 @@
info->add(YCPString("short_name"), YCPString(product_summary));
}
- YCPList updateUrls;
- zypp::Product::UrlList pupdateUrls = product->updateUrls();
- for_( it, pupdateUrls.begin(), pupdateUrls.end() )
- {
- updateUrls->add(YCPString(it->asString()));
- }
+ YCPList updateUrls(asYCPList(product->updateUrls()));
info->add(YCPString("update_urls"), updateUrls);
YCPList flags;
@@ -334,6 +330,12 @@
info->add(YCPString("smolt_urls"), smoltUrls);
}
+ YCPList relNotesUrls(asYCPList(product->releaseNotesUrls()));
+ if ( relNotesUrls.size() )
+ {
+ info->add(YCPString("relnotes_urls"), relNotesUrls);
+ }
+
// registration data
info->add(YCPString("register_target"), YCPString(product->registerTarget()));
info->add(YCPString("register_release"), YCPString(product->registerRelease()));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/src/Source_Download.cc new/yast2-pkg-bindings-2.17.22/src/Source_Download.cc
--- old/yast2-pkg-bindings-2.17.21/src/Source_Download.cc 2008-09-25 14:04:28.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/src/Source_Download.cc 2008-11-03 16:00:32.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Download.cc 51508 2008-09-25 12:04:27Z lslezak $
+ File: $Id: Source_Download.cc 52835 2008-11-03 14:59:03Z lslezak $
Author: Ladislav Slezák
Summary: Functions for downloading files from a repository
Namespace: Pkg
@@ -43,8 +43,15 @@
YCPValue PkgFunctions::SourceProvideFileCommon(const YCPInteger &id,
const YCPInteger &mid,
const YCPString& f,
- const YCPBoolean & optional)
+ const bool optional,
+ const bool check_signatures)
{
+ if (id.isNull() || mid.isNull() || f.isNull())
+ {
+ y2error("ProvideFile: nil argument!");
+ return YCPVoid();
+ }
+
CallInitDownload(std::string(_("Downloading ") + f->value()));
bool found = true;
@@ -57,7 +64,7 @@
ZyppRecipients::MediaChangeSensitivity _silent_probing_old = _silent_probing;
// disable media change callback for optional file
- if (optional->value())
+ if (optional)
_silent_probing = ZyppRecipients::MEDIA_CHANGE_OPTIONALFILE;
zypp::filesystem::Pathname path; // FIXME use ManagedMedia
@@ -65,14 +72,33 @@
{
try
{
- path = repo->mediaAccess()->provideFile(f->value(), mid->value());
- y2milestone("local path: '%s'", path.asString().c_str());
+ if (check_signatures)
+ {
+ // use a Fetcher for downloading signed files (see bnc#409927)
+ zypp::Fetcher fch;
+ zypp::OnMediaLocation mloc(f->value(), 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);
+ fch.start(path, *repo->mediaAccess()); // uses MediaAccess to retrieve
+ fch.reset();
+ path = tmpdir.path() / f->value();
+ }
+ else
+ {
+ path = repo->mediaAccess()->provideFile(f->value(), mid->value());
+ y2milestone("local path: '%s'", path.asString().c_str());
+ }
}
catch (const zypp::Exception& excpt)
{
found = false;
- if (!optional->value())
+ if (!optional)
{
_last_error.setLastError(ExceptionAsString(excpt));
y2milestone("File not found: %s", f->value_cstr());
@@ -112,7 +138,7 @@
YCPValue
PkgFunctions::SourceProvideFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
- return SourceProvideFileCommon(id, mid, f, false /*optional*/);
+ return SourceProvideFileCommon(id, mid, f, false /*optional*/, false /* signed */);
}
/****************************************************************************************
@@ -132,7 +158,33 @@
YCPValue
PkgFunctions::SourceProvideOptionalFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
- return SourceProvideFileCommon(id, mid, f, true /*optional*/);
+ return SourceProvideFileCommon(id, mid, f, true /*optional*/, false /* signed */);
+}
+
+/****************************************************************************************
+ * @builtin SourceProvideSignedFile
+ *
+ * @short Make a signed file available at the local filesystem
+ * @description
+ * Make a signed Let an InstSrc provide some file (make it available at the local filesystem).
+ *
+ * @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::SourceProvideSignedFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f, const YCPBoolean &optional)
+{
+ if (optional.isNull())
+ {
+ y2error("SourceProvideSignedFile: argument 'optional' is nil!");
+ return YCPVoid();
+ }
+
+ return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */);
}
/****************************************************************************************
@@ -233,7 +285,8 @@
// keep the reference to the tmpdir so the directory is not deleted at the and of the block
tmp_dirs.push_back(tmpdir);
path = tmpdir.path();
- f.enqueueDir(mloc, recursive->value());
+ f.setOptions(zypp::Fetcher::AutoAddIndexes);
+ f.enqueueDigestedDir(mloc, recursive->value());
f.start(path, *repo->mediaAccess()); // uses MediaAccess to retrieve
f.reset();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/src/Source_Get.cc new/yast2-pkg-bindings-2.17.22/src/Source_Get.cc
--- old/yast2-pkg-bindings-2.17.21/src/Source_Get.cc 2008-10-01 18:39:49.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/src/Source_Get.cc 2008-11-06 09:59:32.000000000 +0100
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Get.cc 51767 2008-10-01 16:39:48Z lslezak $
+ File: $Id: Source_Get.cc 52962 2008-11-06 08:57:36Z lslezak $
Author: Ladislav Slezák
Summary: Functions for reading repository properties
Namespace: Pkg
@@ -272,6 +272,9 @@
return data;
}
+// defined in Resolvable_Properties.cc
+inline YCPList asYCPList( const zypp::Product::UrlList & urls_r );
+
/****************************************************************************************
* @builtin SourceProductData
* @short Return Product data about the source
@@ -281,11 +284,17 @@
*
* <code>
* $[
- * "label" : YCPString,
- * "vendor" : YCPString,
- * "productname" : YCPString,
- * "productversion" : YCPString,
- * "relnotesurl" : YCPString,
+ * "label" : string,
+ * "vendor" : string,
+ * "productname" : string,
+ * "productversion" : string,
+ * "relnotesurl" : string,
+ * "relnotes_urls" : list<string>
+ * "register_urls" : list<string>
+ * "smolt_urls" : list<string>
+ * "update_urls" : list<string>
+ * "extra_urls" : list<string>
+ * "optional_urls" : list<string>
* ];
* </code>
*
@@ -330,6 +339,13 @@
ret->add( YCPString("productname"), YCPString( product->name() ) );
ret->add( YCPString("productversion"), YCPString( product->edition().version() ) );
ret->add( YCPString("relnotesurl"), YCPString( product->releaseNotesUrls().first().asString()));
+
+ ret->add( YCPString("relnotes_urls"), asYCPList(product->releaseNotesUrls()));
+ ret->add( YCPString("register_urls"), asYCPList(product->registerUrls()));
+ ret->add( YCPString("smolt_urls"), asYCPList(product->smoltUrls()));
+ ret->add( YCPString("update_urls"), asYCPList(product->updateUrls()));
+ ret->add( YCPString("extra_urls"), asYCPList(product->extraUrls()));
+ ret->add( YCPString("optional_urls"), asYCPList(product->optionalUrls()));
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.17.21/VERSION new/yast2-pkg-bindings-2.17.22/VERSION
--- old/yast2-pkg-bindings-2.17.21/VERSION 2008-10-21 15:49:06.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.22/VERSION 2008-11-06 10:13:01.000000000 +0100
@@ -1 +1 @@
-2.17.21
+2.17.22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org