Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2013-12-18 11:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2013-10-20 10:56:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2013-12-18 11:52:02.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 18 08:27:46 UTC 2013 - lsle...@suse.cz + +- eliminate deprecated zypp::DiskUsage class (bnc#852943) + (by mlandres) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.1.tar.bz2 New: ---- yast2-pkg-bindings-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.QSQ8RC/_old 2013-12-18 11:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.QSQ8RC/_new 2013-12-18 11:52:03.000000000 +0100 @@ -17,8 +17,7 @@ Name: yast2-pkg-bindings-devel-doc - -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 @@ -31,7 +30,7 @@ BuildRequires: libxslt BuildRequires: libzypp-devel >= 6.10.0 BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildArch: noarch Requires: yast2-pkg-bindings = %{version} ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.QSQ8RC/_old 2013-12-18 11:52:03.000000000 +0100 +++ /var/tmp/diff_new_pack.QSQ8RC/_new 2013-12-18 11:52:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,12 +27,12 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: libxslt -BuildRequires: libzypp-devel >= 6.10.0 +BuildRequires: libzypp-devel >= 14.2.1 BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # new GPG callbacks -Requires: libzypp >= 6.10.0 +Requires: libzypp >= 14.2.1 Summary: YaST2 - Package Manager Access License: GPL-2.0 ++++++ yast2-pkg-bindings-3.1.1.tar.bz2 -> yast2-pkg-bindings-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/CONTRIBUTING.md new/yast2-pkg-bindings-3.1.2/CONTRIBUTING.md --- old/yast2-pkg-bindings-3.1.1/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-3.1.2/CONTRIBUTING.md 2013-12-18 09:36:43.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/VERSION new/yast2-pkg-bindings-3.1.2/VERSION --- old/yast2-pkg-bindings-3.1.1/VERSION 2013-10-17 13:46:02.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings-devel-doc.spec 2013-10-17 14:16:02.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings-devel-doc.spec 2013-12-18 09:36:43.000000000 +0100 @@ -16,8 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc - -Version: 3.1.1 +Version: 3.1.2 Release: 0 License: GPL-2.0 Group: Documentation/HTML @@ -32,7 +31,7 @@ BuildRequires: libxslt BuildRequires: libzypp-devel >= 6.10.0 BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 Buildarch: noarch Requires: yast2-pkg-bindings = %{version} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings.changes 2013-10-17 13:46:02.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.changes 2013-12-18 09:36:43.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 18 08:27:46 UTC 2013 - lsle...@suse.cz + +- eliminate deprecated zypp::DiskUsage class (bnc#852943) + (by mlandres) +- 3.1.2 + +------------------------------------------------------------------- Mon Sep 30 14:18:10 UTC 2013 - lsle...@suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.1/package/yast2-pkg-bindings.spec 2013-10-17 14:16:02.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.2/package/yast2-pkg-bindings.spec 2013-12-18 09:36:43.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,12 +30,12 @@ BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: libxslt -BuildRequires: libzypp-devel >= 6.10.0 +BuildRequires: libzypp-devel >= 14.2.1 BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # new GPG callbacks -Requires: libzypp >= 6.10.0 +Requires: libzypp >= 14.2.1 Summary: YaST2 - Package Manager Access diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.1/src/Package.cc new/yast2-pkg-bindings-3.1.2/src/Package.cc --- old/yast2-pkg-bindings-3.1.1/src/Package.cc 2013-10-17 13:46:02.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.2/src/Package.cc 2013-12-18 09:36:43.000000000 +0100 @@ -2630,9 +2630,6 @@ YCPValue PkgFunctions::PkgDU(const YCPString& package) { - // get partitioning - zypp::DiskUsageCounter::MountPointSet mps = zypp_ptr()->getPartitions(); - zypp::Package::constPtr pkg = find_package(package->value()); // the package was not found @@ -2641,26 +2638,9 @@ return YCPVoid(); } - zypp::DiskUsage du = pkg->diskusage(); - - if (du.size() == 0) - { - y2warning("Disk usage for package %s is unknown", package->value().c_str()); - return YCPVoid(); - } - - // iterate trough all mount points, add usage to each directory - // directory tree must be processed from leaves to the root directory - // so iterate in reverse order so e.g. /usr is used before / - for (zypp::DiskUsageCounter::MountPointSet::reverse_iterator mpit = mps.rbegin(); mpit != mps.rend(); mpit++) - { - // get usage for the mount point - zypp::DiskUsage::Entry entry = du.extract(mpit->dir); - - mpit->pkg_size += entry._size; - } - - return MPS2YCPMap(mps); + // get partitioning + zypp::DiskUsageCounter ducounter( zypp_ptr()->getPartitions() ); + return MPS2YCPMap( ducounter.disk_usage( pkg ) ); } // helper function - create a symbolic link to the created base product (by SourceCreateBase() function) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org