Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Jul 17 22:52:37 CEST 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-06-27 10:52:19.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-07-17 13:21:48.596090000 +0200
@@ -1,0 +2,10 @@
+Thu Jul 17 11:42:54 CEST 2008 - ma@suse.de
+
+- Remove obsolete references to Script/Message/Atom
+
+-------------------------------------------------------------------
+Fri Jun 27 16:54:00 CEST 2008 - lslezak@suse.cz
+
+- Fixed Pkg::GetPackages(`available) to ignore installed packages
+
+-------------------------------------------------------------------
@@ -154,2 +164,2 @@
-- Fix TargetProducts to return the satisfies products. Is satisfied
- status is computed and updated on each solver run. So it does not
+- Fix TargetProducts to return the satisfies products. Is satisfied
+ status is computed and updated on each solver run. So it does not
@@ -347 +357 @@
- a repository (much faster than iterating over all resolvables)
+ a repository (much faster than iterating over all resolvables)
@@ -362 +372 @@
-- merged Pkg::SourceCreate() and Pkg::SourceScan() code
+- merged Pkg::SourceCreate() and Pkg::SourceScan() code
@@ -734 +744 @@
- effect during installation)
+ effect during installation)
@@ -1081 +1091 @@
-- require zypp version 2.0.0
+- require zypp version 2.0.0
@@ -1094 +1104 @@
-- 2.13.91
+- 2.13.91
@@ -1250 +1260 @@
-- Do not try to evaluate the same callback twice, the parameters
+- Do not try to evaluate the same callback twice, the parameters
@@ -1252 +1262 @@
-- 2.13.70
+- 2.13.70
@@ -1323 +1333 @@
-- Adapt for new digest callbacks in ZYPP
+- Adapt for new digest callbacks in ZYPP
@@ -1352 +1362 @@
-- 2.13.56
+- 2.13.56
@@ -1375 +1385 @@
-- 2.13.52
+- 2.13.52
@@ -1408 +1418 @@
-- implemented SourceCleanupBroken (#157100)
+- implemented SourceCleanupBroken (#157100)
@@ -1453 +1463 @@
-- return correct type in SourceCreate and SourceScan if URL wrong
+- return correct type in SourceCreate and SourceScan if URL wrong
@@ -1476 +1486 @@
-- 2.13.42
+- 2.13.42
@@ -1505 +1515 @@
-- 2.13.38
+- 2.13.38
@@ -1516 +1526 @@
-- 2.13.36
+- 2.13.36
@@ -1534 +1544 @@
-- 2.13.35
+- 2.13.35
@@ -1540 +1550 @@
-- 2.13.34
+- 2.13.34
@@ -1552 +1562 @@
-- 2.13.32
+- 2.13.32
@@ -1587 +1597 @@
-- 2.13.28
+- 2.13.28
@@ -1609 +1619 @@
-- if no products found by libzypp, try also the base URL
+- if no products found by libzypp, try also the base URL
@@ -1671 +1681 @@
-- new builtin Pkg::Init()
+- new builtin Pkg::Init()
@@ -1691 +1701 @@
-- report user-abort from ProgressPackage callback (#150379)
+- report user-abort from ProgressPackage callback (#150379)
@@ -1730 +1740 @@
-- implement missing download progress callback
+- implement missing download progress callback
@@ -1780 +1790 @@
-- Don't generate doxygen documentation, this is not a C++ library
+- Don't generate doxygen documentation, this is not a C++ library
@@ -1787 +1797 @@
-- 2.13.13
+- 2.13.13
@@ -1806 +1816 @@
-- 2.13.10
+- 2.13.10
@@ -1811 +1821 @@
-- adapt for new pool iterators
+- adapt for new pool iterators
@@ -1825 +1835 @@
-- Callback cleanup
+- Callback cleanup
@@ -1832 +1842 @@
-- this makes the download progress behave nicely
+- this makes the download progress behave nicely
@@ -1839,2 +1849,2 @@
-- SetLocale, GetLocale, SetAdditionalLocales, GetAdditionalLocales,
- updated SelectionContent, SelectionData
+- SetLocale, GetLocale, SetAdditionalLocales, GetAdditionalLocales,
+ updated SelectionContent, SelectionData
@@ -1852 +1862 @@
-- Pkg::SourceProductData enhanced to return product name and
+- Pkg::SourceProductData enhanced to return product name and
@@ -1854 +1864 @@
-- 2.13.6
+- 2.13.6
@@ -1866 +1876 @@
-- connect also for source data parser and avoid media callback
+- connect also for source data parser and avoid media callback
@@ -1872 +1882 @@
-- adapt for new libzypp
+- adapt for new libzypp
@@ -1906 +1916 @@
-- 2.13.1.7
+- 2.13.1.7
@@ -1918 +1928 @@
-- Renamed files
+- Renamed files
@@ -1928 +1938 @@
-- Adapt for new libzypp
+- Adapt for new libzypp
@@ -1936 +1946 @@
-- 2.13.1.4
+- 2.13.1.4
@@ -1958 +1968 @@
-- 2.13.1.1
+- 2.13.1.1
Old:
----
yast2-pkg-bindings-devel-doc.changes
yast2-pkg-bindings-devel-doc.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.r31075/_old 2008-07-17 22:51:42.000000000 +0200
+++ /var/tmp/diff_new_pack.r31075/_new 2008-07-17 22:51:42.000000000 +0200
@@ -13,7 +13,7 @@
Name: yast2-pkg-bindings
Version: 2.17.1
-Release: 1
+Release: 7
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -72,6 +72,10 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Thu Jul 17 2008 ma@suse.de
+- Remove obsolete references to Script/Message/Atom
+* Fri Jun 27 2008 lslezak@suse.cz
+- Fixed Pkg::GetPackages(`available) to ignore installed packages
* Fri Jun 27 2008 lslezak@suse.cz
- support for patch messages and patch scripts (bnc#401220)
- 2.17.1
++++++ yast2-pkg-bindings-2.17.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/configure.in new/yast2-pkg-bindings-2.17.1/configure.in
--- old/yast2-pkg-bindings-2.17.1/configure.in 2008-06-27 10:49:42.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.1/configure.in 2008-07-14 14:05:51.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-pkg-bindings, 2.17.1, http://bugs.opensuse.org/, yast2-pkg-bindings)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/pkg-bindings.pot new/yast2-pkg-bindings-2.17.1/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.17.1/pkg-bindings.pot 2007-12-12 16:36:49.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.1/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,148 +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: 2007-12-12 16:36+0100\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"
-
-#. help text
-#: src/HelpTexts.h:36
-msgid "<P><BIG><B>Loading Available Packages</B></BIG></P><P>Loading available objects from the configured repositories is in progress. This may take a while...</P>"
-msgstr ""
-
-#. help text
-#: src/HelpTexts.h:42
-msgid "<P><BIG><B>Loading Installed Packages</B><BIG></P><P>The package manager is reading installed packages...</P>"
-msgstr ""
-
-#. help text
-#: src/HelpTexts.h:47
-msgid "<P><BIG><B>Registering a New Repository</B></BIG></P><P>A new repository is being registered. The package manager is reading list of available packages in the repository...</P>"
-msgstr ""
-
-#: src/HelpTexts.h:52
-msgid "<P><BIG><B>Saving Repositories</B></BIG></P><P>The package manager is updating configured repositories...</P>"
-msgstr ""
-
-#: src/HelpTexts.h:55
-msgid "<P><BIG><B>Refreshing the Repository</B></BIG></P><P>The package manager is updating the repository content...</P>"
-msgstr ""
-
-#: src/Source_Callbacks.cc:129
-msgid "Refreshing repository "
-msgstr ""
-
-#: src/Source_Callbacks.cc:150
-msgid "Probing repository "
-msgstr ""
-
-#: src/Source_Create.cc:51
-msgid "Scanning products in "
-msgstr ""
-
-#: src/Source_Create.cc:593
-msgid "Search Available Products"
-msgstr ""
-
-#: src/Source_Create.cc:598
-msgid "Probe Source Type"
-msgstr ""
-
-#: src/Source_Create.cc:601
-msgid "Download Descriptions"
-msgstr ""
-
-#: src/Source_Create.cc:602 src/Source_Download.cc:243 src/Source_Load.cc:112
-#: src/Source_Load.cc:304
-msgid "Rebuild Cache"
-msgstr ""
-
-#: src/Source_Create.cc:606 src/Source_Load.cc:113 src/Source_Load.cc:305
-#: src/Source_Set.cc:75
-msgid "Load Data"
-msgstr ""
-
-#: src/Source_Create.cc:609
-msgid "Adding the Repository..."
-msgstr ""
-
-#: src/Source_Download.cc:45 src/Source_Download.cc:173
-msgid "Downloading "
-msgstr ""
-
-#. stages: "download", "build cache"
-#: src/Source_Download.cc:242
-msgid "Refresh Metadata"
-msgstr ""
-
-#. 3 steps per repository (download, cache rebuild, load resolvables)
-#: src/Source_Download.cc:250
-msgid "Refreshing Repository..."
-msgstr ""
-
-#. error message (followed by detailed description)
-#: src/Source_Installation.cc:69
-msgid "Error: Cannot copy the cache to the target directory\n"
-msgstr ""
-
-#. error message (followed by directory name)
-#: src/Source_Installation.cc:103
-msgid "Cannot create directory "
-msgstr ""
-
-#. error message
-#: src/Source_Installation.cc:133
-msgid "Copying failed"
-msgstr ""
-
-#: src/Source_Load.cc:111 src/Source_Load.cc:303
-msgid "Refresh Sources"
-msgstr ""
-
-#. 3 steps per repository (download, cache rebuild, load resolvables)
-#: src/Source_Load.cc:118 src/Source_Load.cc:308 src/Source_Set.cc:82
-#: src/Target_Load.cc:65 src/Target_Load.cc:129
-msgid "Loading the Package Manager..."
-msgstr ""
-
-#: src/Source_Load.cc:302
-msgid "Load Sources"
-msgstr ""
-
-#. TODO: improve the error message
-#: src/Source_Misc.cc:72
-msgid "Cannot find source"
-msgstr ""
-
-#: src/Source_Save.cc:112
-msgid "Remove Repositories"
-msgstr ""
-
-#. stages: "download", "build cache"
-#: src/Source_Save.cc:117
-msgid "Save Repositories"
-msgstr ""
-
-#. start the process
-#: src/Source_Save.cc:125
-msgid "Saving Repositories..."
-msgstr ""
-
-#: src/Target_Load.cc:61
-msgid "Initialize the Target System"
-msgstr ""
-
-#: src/Target_Load.cc:62 src/Target_Load.cc:125
-msgid "Read Installed Packages"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/src/Callbacks.cc new/yast2-pkg-bindings-2.17.1/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.17.1/src/Callbacks.cc 2008-06-19 14:06:43.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.1/src/Callbacks.cc 2008-07-14 14:58:03.000000000 +0200
@@ -281,7 +281,7 @@
if (callback._set) {
callback.addStr(res->location().filename());
callback.addStr(res->summary());
- callback.addInt(res->size());
+ callback.addInt(res->installSize());
callback.addBool(false); // is_delete = false (package installation)
callback.evaluate();
}
@@ -422,7 +422,7 @@
}
};
-
+
struct ProgressReceive : public Recipient, public zypp::callback::ReceiveReportzypp::ProgressReport
{
ProgressReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
@@ -646,7 +646,7 @@
callback.evaluate();
}
}
-
+
// Apply delta rpm:
// - local path of downloaded delta
@@ -697,7 +697,7 @@
callback.evaluate();
}
}
-
+
// Download patch rpm:
// - path below url reported on start()
@@ -824,7 +824,7 @@
return zypp::media::DownloadProgressReport::problem(file, error, description);
}
- virtual void finish( const zypp::Url &file, zypp::media::DownloadProgressReport::Error error, const std::string &reason)
+ virtual void finish( const zypp::Url &file, zypp::media::DownloadProgressReport::Error error, const std::string &reason)
{
CB callback( ycpcb( YCPCallbacks::CB_DoneDownload ) );
@@ -866,7 +866,7 @@
callback.evaluate();
}
}
-
+
virtual bool progress( zypp::target::PatchScriptReport::Notify ping, const std::string &out = std::string() )
{
CB callback( ycpcb( YCPCallbacks::CB_ScriptProgress) );
@@ -899,7 +899,7 @@
// "A" = abort
if (ret == "A") return zypp::target::PatchScriptReport::ABORT;
- // "I" = ignore
+ // "I" = ignore
if (ret == "I") return zypp::target::PatchScriptReport::IGNORE;
// "R" = retry
@@ -1083,7 +1083,7 @@
if (!found)
{
// the source has not been redirected
- // use URL of the source
+ // use URL of the source
report_url = url;
}
@@ -1151,7 +1151,7 @@
// set the new URL
url = zypp::Url(ret);
- // remember the redirection
+ // remember the redirection
MediaMap source_redir = redirect_map[url];
source_redir[mediumNr] = url;
redirect_map[url] = source_redir;
@@ -1298,7 +1298,7 @@
virtual void start(const zypp::Url &url)
{
_silent_probing = MEDIA_CHANGE_DISABLE;
-
+
CB callback( ycpcb( YCPCallbacks::CB_SourceProbeStart ) );
if (callback._set)
@@ -1502,8 +1502,8 @@
zypp::repo::RepoReport::Error error, const std::string &description)
{
CB callback( ycpcb( YCPCallbacks::CB_SourceReportError ) );
-
- // the file is optional, ignore the error
+
+ // the file is optional, ignore the error
if (_silent_probing == ZyppRecipients::MEDIA_CHANGE_OPTIONALFILE)
{
y2milestone("The file is optional, ignoring the error");
@@ -1567,31 +1567,6 @@
}
};
-
- struct ResolvableReport : public Recipient, public zypp::callback::ReceiveReportzypp::target::MessageResolvableReport
- {
- ResolvableReport( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
-
- virtual void show(zypp::Message::constPtr message)
- {
- CB callback( ycpcb( YCPCallbacks::CB_ResolvableReport) );
-
- if (callback._set)
- {
- zypp::Patch::constPtr patch = message->patch();
-
- // patch name
- callback.addStr(patch ? patch->name() : message->name());
- // patch summary
- callback.addStr(patch ? patch->summary() : message->summary());
- // message itself
- callback.addStr(message->text().asString());
-
- callback.evaluate();
- }
- }
- };
-
///////////////////////////////////////////////////////////////////
// DigestReport handler
///////////////////////////////////////////////////////////////////
@@ -1643,7 +1618,7 @@
return zypp::DigestReport::askUserToAcceptWrongDigest(file, requested, found);
}
-
+
};
@@ -1730,7 +1705,7 @@
return zypp::KeyRingReport::askUserToAcceptUnknownKey(file,id);
}
- virtual bool askUserToAcceptVerificationFailed(const std::string &file, const zypp::PublicKey &key)
+ virtual bool askUserToAcceptVerificationFailed(const std::string &file, const zypp::PublicKey &key)
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptVerificationFailed) );
@@ -1823,9 +1798,6 @@
ZyppRecipients::ProgressReceive _progressReceive;
- // resolvable report
- ZyppRecipients::ResolvableReport _resolvableReport;
-
// digest callback
ZyppRecipients::DigestReceive _digestReceive;
@@ -1837,7 +1809,7 @@
// authentication callback
ZyppRecipients::AuthReceive _authReceive;
-
+
public:
ZyppReceive( const YCPCallbacks & ycpcb_r, const PkgFunctions &pkg)
@@ -1856,7 +1828,6 @@
, _sourceReport( *this, pkg)
, _probeSourceReceive( *this )
, _progressReceive( *this )
- , _resolvableReport( *this )
, _digestReceive( *this )
, _keyRingReceive( *this )
, _keyRingSignal( *this )
@@ -1877,7 +1848,6 @@
_sourceReport.connect();
_probeSourceReceive.connect();
_progressReceive.connect();
- _resolvableReport.connect();
_digestReceive.connect();
_keyRingReceive.connect();
_keyRingSignal.connect();
@@ -1901,7 +1871,6 @@
_sourceReport.disconnect();
_probeSourceReceive.disconnect();
_progressReceive.disconnect();
- _resolvableReport.disconnect();
_digestReceive.disconnect();
_keyRingReceive.disconnect();
_keyRingSignal.disconnect();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/src/Package.cc new/yast2-pkg-bindings-2.17.1/src/Package.cc
--- old/yast2-pkg-bindings-2.17.1/src/Package.cc 2008-05-06 17:15:35.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.1/src/Package.cc 2008-07-14 14:24:46.000000000 +0200
@@ -265,7 +265,7 @@
// ignore disabled or delted sources
if (!(*it)->repoInfo().enabled() || (*it)->isDeleted())
continue;
-
+
source_ids.push_back(index);
}
@@ -308,7 +308,7 @@
if (medium > 0)
{
- zypp::ByteCount size = sizes ? (download_size ? pkg->downloadSize() : pkg->size()) : zypp::ByteCount(1); //count only
+ zypp::ByteCount size = sizes ? (download_size ? pkg->downloadSize() : pkg->installSize()) : zypp::ByteCount(1); //count only
// refence to the found media array
std::vectorzypp::ByteCount &ref = result[source_map[pkg->repoInfo().alias()]];
@@ -529,7 +529,7 @@
bool found = false;
std::string pkgname = package->value();
-
+
if (pkgname.empty())
{
y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable");
@@ -611,7 +611,7 @@
try
{
std::string repo_alias;
-
+
if (repo_id >= 0)
{
YRepo_Ptr repo = logFindRepository(repo_id);
@@ -948,7 +948,7 @@
return YCPVoid();
}
- return YCPInteger( pkg->size() );
+ return YCPInteger( pkg->installSize() );
}
catch (...)
{
@@ -1544,7 +1544,10 @@
}
else if (which == "available")
{
- pkg2list(packages, it, names_only);
+ if (!it->status().isInstalled())
+ {
+ pkg2list(packages, it, names_only);
+ }
}
else if (which == "locked")
{
@@ -1628,7 +1631,7 @@
* on the delete_unmaintained arg, they are either tagged as to delete or
* remain unchanged.
*
- * @return map summary of the update
+ * @return map summary of the update
*/
YCPValue
@@ -2151,7 +2154,7 @@
// if the target log is not set use the default to not loose the information
if (!target_log_set)
{
- std::string default_path(_target_root.asString() + "/var/log/YaST2/y2logRPM");
+ std::string default_path(_target_root.asString() + "/var/log/YaST2/y2logRPM");
y2warning("Pkg::TargetLogFile() has not been called, using %s for logging", default_path.c_str());
zypp_ptr()->target()->setInstallationLogfile(default_path);
}
@@ -2174,7 +2177,7 @@
return YCPVoid();
}
- SourceReleaseAll();
+ SourceReleaseAll();
YCPList ret;
@@ -2197,10 +2200,6 @@
resolvable->add (YCPString ("kind"), YCPSymbol ("product"));
else if (zypp::isKindzypp::Pattern(it->resolvable()))
resolvable->add (YCPString ("kind"), YCPSymbol ("pattern"));
- else if (zypp::isKindzypp::Script(it->resolvable()))
- resolvable->add (YCPString ("kind"), YCPSymbol ("script"));
- else if (zypp::isKindzypp::Message(it->resolvable()))
- resolvable->add (YCPString ("kind"), YCPSymbol ("message"));
else if (zypp::isKindzypp::Patch(it->resolvable()))
resolvable->add (YCPString ("kind"), YCPSymbol ("patch"));
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.1/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.17.1/src/Resolvable_Properties.cc
--- old/yast2-pkg-bindings-2.17.1/src/Resolvable_Properties.cc 2008-06-18 12:45:41.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.1/src/Resolvable_Properties.cc 2008-07-14 14:26:40.000000000 +0200
@@ -225,7 +225,7 @@
}
info->add(YCPString("download_size"), YCPInteger((*it)->downloadSize()));
- info->add(YCPString("inst_size"), YCPInteger((*it)->size()));
+ info->add(YCPString("inst_size"), YCPInteger((*it)->installSize()));
info->add(YCPString("medium_nr"), YCPInteger((*it)->mediaNr()));
info->add(YCPString("vendor"), YCPString((*it)->vendor()));
@@ -340,8 +340,8 @@
zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(it->resolvable());
info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive()));
- info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->reboot_needed()));
- info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->affects_pkg_manager()));
+ info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->rebootSuggested()));
+ info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->restartSuggested()));
info->add(YCPString("is_needed"), YCPBoolean(it->isBroken()));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org