Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11599 - in /trunk/libzypp/zypp/parser: ProductFileReader.cc ProductFileReader.h
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Thu, 06 Nov 2008 16:39:36 -0000
  • Message-id: <20081106163936.4C61833901@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Thu Nov 6 17:39:35 2008
New Revision: 11599

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11599&view=rev
Log:
rename Upgrade.product to Upgrade.repository

Modified:
trunk/libzypp/zypp/parser/ProductFileReader.cc
trunk/libzypp/zypp/parser/ProductFileReader.h

Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileReader.cc?rev=11599&r1=11598&r2=11599&view=diff
==============================================================================
--- trunk/libzypp/zypp/parser/ProductFileReader.cc (original)
+++ trunk/libzypp/zypp/parser/ProductFileReader.cc Thu Nov 6 17:39:35 2008
@@ -40,7 +40,7 @@
{
std::string _name;
std::string _summary;
- std::string _product;
+ std::string _repository;
DefaultIntegral<bool,false> _notify;
std::string _status;
};
@@ -49,11 +49,11 @@
: _pimpl( allocated_r ? allocated_r : new Impl )
{}

- std::string ProductFileData::Upgrade::name() const { return
_pimpl->_name; }
- std::string ProductFileData::Upgrade::summary() const { return
_pimpl->_summary; }
- std::string ProductFileData::Upgrade::product() const { return
_pimpl->_product; }
- bool ProductFileData::Upgrade::notify() const { return
_pimpl->_notify; }
- std::string ProductFileData::Upgrade::status() const { return
_pimpl->_status; }
+ std::string ProductFileData::Upgrade::name() const { return
_pimpl->_name; }
+ std::string ProductFileData::Upgrade::summary() const { return
_pimpl->_summary; }
+ std::string ProductFileData::Upgrade::repository() const { return
_pimpl->_repository; }
+ bool ProductFileData::Upgrade::notify() const { return
_pimpl->_notify; }
+ std::string ProductFileData::Upgrade::status() const { return
_pimpl->_status; }

/////////////////////////////////////////////////////////////////
//
@@ -113,7 +113,7 @@
{
str << str::form( "|upgrade|%s|%s|%s|%s|",
obj.name().c_str(),
- obj.product().c_str(),
+ obj.repository().c_str(),
obj.status().c_str(),
(obj.notify() ? "notify" : "noNotify") );
return str;
@@ -154,7 +154,7 @@
(*this)["upgrades"]["upgrade"]
("name", OPTIONAL, xml::parseDefAssignText(
_upgrade._name ) )
("summary", OPTIONAL, xml::parseDefAssignText(
_upgrade._summary ) )
- ("repository", OPTIONAL, xml::parseDefAssignText(
_upgrade._product ) )
+ ("repository", OPTIONAL, xml::parseDefAssignText(
_upgrade._repository ) )
("notify", OPTIONAL, xml::parseDefAssignText(
_upgrade._notify ) )
("status", OPTIONAL, xml::parseDefAssignText(
_upgrade._status ) )
;
@@ -251,7 +251,7 @@
{
if ( ! PathInfo( file_r ).isFile() )
{
- WAR << "scanFile " << PathInfo( file_r ) << " is no t a file." << endl;
+ WAR << "scanFile " << PathInfo( file_r ) << " is not a file." << endl;
return ProductFileData();
}


Modified: trunk/libzypp/zypp/parser/ProductFileReader.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileReader.h?rev=11599&r1=11598&r2=11599&view=diff
==============================================================================
--- trunk/libzypp/zypp/parser/ProductFileReader.h (original)
+++ trunk/libzypp/zypp/parser/ProductFileReader.h Thu Nov 6 17:39:35 2008
@@ -74,7 +74,7 @@
public:
std::string name() const;
std::string summary() const;
- std::string product() const;
+ std::string repository() const;
bool notify() const;
std::string status() const;


--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages