From ccfb96764ce015585ce99295be48d0a16f31ba27 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Mon, 12 Jun 2006 13:13:18 +0000 Subject: [PATCH] - fix #182003 YUM packages without size --- zypp/source/yum/YUMPackageImpl.cc | 20 +++++++++++--------- zypp/source/yum/YUMPackageImpl.h | 6 ++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/zypp/source/yum/YUMPackageImpl.cc b/zypp/source/yum/YUMPackageImpl.cc index 11e0ab5..d1f3b7c 100644 --- a/zypp/source/yum/YUMPackageImpl.cc +++ b/zypp/source/yum/YUMPackageImpl.cc @@ -43,7 +43,7 @@ namespace zypp : _summary(parsed.summary), _description(parsed.description), _license_to_confirm(parsed.license_to_confirm), // TODO add to metadata - _buildtime(strtol(parsed.timeBuild.c_str(), 0, 10)), + _buildtime(str::strtonum(parsed.timeBuild)), _buildhost(parsed.buildhost), _url(parsed.url), _vendor( parsed.vendor), @@ -54,7 +54,9 @@ namespace zypp _type(parsed.type), _authors(parsed.authors), _keywords( parsed.keywords), - _mediaNumber(strtol(parsed.media.c_str(), 0, 10)), + _mediaNumber(str::strtonum(parsed.media)), + _size(str::strtonum(parsed.sizeInstalled)), + _package_size(str::strtonum(parsed.sizePackage)), _checksum(parsed.checksumType, parsed.checksum), _filenames(), @@ -96,7 +98,7 @@ namespace zypp : _summary(parsed.summary), _description(parsed.description), _license_to_confirm(parsed.license_to_confirm), - _buildtime(strtol(parsed.timeBuild.c_str(), 0, 10)), + _buildtime(str::strtonum(parsed.timeBuild)), _buildhost(parsed.buildhost), _url(parsed.url), _vendor( parsed.vendor), @@ -107,11 +109,13 @@ namespace zypp _type(parsed.type), _authors(parsed.authors), _keywords( parsed.keywords), - _mediaNumber(strtol(parsed.media.c_str(), 0, 10)), + _mediaNumber(str::strtonum(parsed.media)), + _size(str::strtonum(parsed.sizeInstalled)), + _package_size(str::strtonum(parsed.sizePackage)), _checksum(parsed.checksumType, parsed.checksum), _filenames(), - _location( parsed.plainRpms.empty() ? Pathname() : parsed.plainRpms.front().filename), + _location( parsed.plainRpms.empty() ? Pathname() : parsed.plainRpms.front().filename), _delta_rpms(), _patch_rpms(), @@ -207,8 +211,7 @@ namespace zypp /** */ ByteCount YUMPackageImpl::size() const -#warning fixme - { return 0; } + { return _size; } /** */ Date YUMPackageImpl::buildtime() const @@ -288,8 +291,7 @@ namespace zypp /** */ ByteCount YUMPackageImpl::archivesize() const -#warning fixme - { return 0; } + { return _package_size; } /** */ std::list YUMPackageImpl::authors() const diff --git a/zypp/source/yum/YUMPackageImpl.h b/zypp/source/yum/YUMPackageImpl.h index f4196a5..63b96e5 100644 --- a/zypp/source/yum/YUMPackageImpl.h +++ b/zypp/source/yum/YUMPackageImpl.h @@ -140,10 +140,12 @@ namespace zypp std::list _patch_rpms; bool _install_only; + + unsigned int _package_size; + unsigned int _size; + /* unsigned _size_package; - unsigned _size_installed; - unsigned _size_archive; std::string _sourcepkg; std::list _dir_sizes; */ -- 2.7.4