Author: matz Date: Fri Feb 8 00:00:35 2008 New Revision: 8550 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8550&view=rev Log: Use the correct attribute for license and eula. Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Package.cc branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Package.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/Package.cc?rev=8550&r1=8549&r2=8550&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Package.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Package.cc Fri Feb 8 00:00:35 2008 @@ -53,7 +53,7 @@ /** */ Label Package::license() const - { return Label(); } + { return lookupStrAttribute( sat::SolvAttr::eula ); } /** */ std::string Package::packager() const Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.cc?rev=8550&r1=8549&r2=8550&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ResObject.cc Fri Feb 8 00:00:35 2008 @@ -126,7 +126,7 @@ { return lookupStrAttribute( sat::SolvAttr::delnotify ); } License ResObject::licenseToConfirm() const - { return lookupStrAttribute( sat::SolvAttr::license ); } + { return lookupStrAttribute( sat::SolvAttr::eula ); } Vendor ResObject::vendor() const { return lookupStrAttribute( sat::SolvAttr::vendor ); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc?rev=8550&r1=8549&r2=8550&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.cc Fri Feb 8 00:00:35 2008 @@ -33,9 +33,10 @@ const SolvAttr SolvAttr::downloadsize ( "downloadsize" ); //package - const SolvAttr SolvAttr::medianr ( "medianr" ); - const SolvAttr SolvAttr::mediafile ( "mediafile" ); - const SolvAttr SolvAttr::mediadir ( "mediadir" ); + const SolvAttr SolvAttr::medianr ( "medianr" ); + const SolvAttr SolvAttr::mediafile ( "mediafile" ); + const SolvAttr SolvAttr::mediadir ( "mediadir" ); + const SolvAttr SolvAttr::eula ( "eula" ); } // namespace sat ///////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h?rev=8550&r1=8549&r2=8550&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SolvAttr.h Fri Feb 8 00:00:35 2008 @@ -54,6 +54,7 @@ static const SolvAttr mediadir; static const SolvAttr medianr; static const SolvAttr mediafile; + static const SolvAttr eula; //@} public: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org