Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10642 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/Package.cc zypp/sat/SolvAttr.cc zypp/sat/SolvAttr.h
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Tue, 22 Jul 2008 13:25:32 -0000
  • Message-id: <20080722132532.B2DCB2A1AA@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Tue Jul 22 15:25:32 2008
New Revision: 10642

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10642&view=rev
Log:
- Provide Package::url() if available in solv file. (bnc #402434)

Modified:
branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake
branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Package.cc
branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.cc
branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.h

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=10642&r1=10641&r2=10642&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Tue Jul 22 15:25:32
2008
@@ -45,6 +45,6 @@
#

SET(LIBZYPP_MAJOR "4")
-SET(LIBZYPP_MINOR "26")
+SET(LIBZYPP_MINOR "27")
SET(LIBZYPP_COMPATMINOR "24")
-SET(LIBZYPP_PATCH "7")
+SET(LIBZYPP_PATCH "0")

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=10642&r1=10641&r2=10642&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Tue Jul 22
15:25:32 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Jul 22 15:23:22 CEST 2008 - ma@xxxxxxx
+
+- Provide Package::url() if available in solv file. (bnc #402434)
+- version 4.27.0
+- revision 10642
+
+-------------------------------------------------------------------
Mon Jul 14 12:11:06 CEST 2008 - schubi@xxxxxxx

- corrected logging onf solver settings
@@ -8,7 +15,7 @@
-------------------------------------------------------------------
Mon Jul 7 13:58:16 CEST 2008 - schubi@xxxxxxx

-- Do not update an already updated package Bug 400422
+- Do not update an already updated package (bnc #400422)
- Revision 10506

-------------------------------------------------------------------

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Package.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Package.cc?rev=10642&r1=10641&r2=10642&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Package.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/Package.cc Tue Jul 22 15:25:32
2008
@@ -51,7 +51,7 @@
Changelog Package::changelog() const
{
Target_Ptr target;
- try
+ try
{
target = getZYpp()->target();
}
@@ -60,8 +60,8 @@
ERR << "Target not initialized. Changelog is not available." <<
std::endl;
return Changelog();
}
-
-
+
+
if ( repository().isSystemRepo() )
{
target::rpm::RpmHeader::constPtr header;
@@ -72,36 +72,27 @@
return Changelog();
}

- /** */
std::string Package::buildhost() const
{ return lookupStrAttribute( sat::SolvAttr::buildhost ); }

- /** */
std::string Package::distribution() const
{ return lookupStrAttribute( sat::SolvAttr::distribution ); }

- /** */
std::string Package::license() const
{ return lookupStrAttribute( sat::SolvAttr::license ); }

- /** */
std::string Package::packager() const
{ return lookupStrAttribute( sat::SolvAttr::packager ); }

- /** */
std::string Package::group() const
{ return lookupStrAttribute( sat::SolvAttr::group ); }

Package::Keywords Package::keywords() const
{ return Keywords( sat::SolvAttr::keywords, satSolvable() ); }

- /** Don't ship it as class Url, because it might be
- * in fact anything but a legal Url. */
-#warning DUMMY url
std::string Package::url() const
- { return string(); }
+ { return lookupStrAttribute( sat::SolvAttr::url ); }

- /** */
ByteCount Package::sourcesize() const
{ return lookupNumAttribute( sat::SolvAttr::sourcesize ); }

@@ -113,8 +104,8 @@
}

std::list<std::string> Package::filenames() const
- {
- std::list<std::string> files;
+ {
+ std::list<std::string> files;
sat::LookupAttr q( sat::SolvAttr::filelist, *this );
for_( it, q.begin(), q.end() )
{
@@ -129,20 +120,20 @@
OnMediaLocation Package::location() const
{ return lookupLocation(); }

- std::string Package::sourcePkgName() const
- {
+ std::string Package::sourcePkgName() const
+ {
// no id means same as package
- sat::detail::IdType id( lookupIdAttribute( sat::SolvAttr::sourcename ) );
- id = lookupIdAttribute(sat::SolvAttr::sourcearch);
- return id ? IdString( id ).asString() : name();
- }
+ sat::detail::IdType id( lookupIdAttribute( sat::SolvAttr::sourcename ) );
+ id = lookupIdAttribute(sat::SolvAttr::sourcearch);
+ return id ? IdString( id ).asString() : name();
+ }

- Edition Package::sourcePkgEdition() const
- {
+ Edition Package::sourcePkgEdition() const
+ {
// no id means same as package
- sat::detail::IdType id( lookupIdAttribute( sat::SolvAttr::sourceevr ) );
- return id ? Edition( id ) : edition();
- }
+ sat::detail::IdType id( lookupIdAttribute( sat::SolvAttr::sourceevr ) );
+ return id ? Edition( id ) : edition();
+ }

/////////////////////////////////////////////////////////////////
} // namespace zypp

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.cc?rev=10642&r1=10641&r2=10642&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.cc Tue Jul 22
15:25:32 2008
@@ -68,6 +68,7 @@
const SolvAttr SolvAttr::sourcename ( SOLVABLE_SOURCENAME );
const SolvAttr SolvAttr::sourceevr ( SOLVABLE_SOURCEEVR );
const SolvAttr SolvAttr::headerend ( SOLVABLE_HEADEREND );
+ const SolvAttr SolvAttr::url ( SOLVABLE_URL );

// patch
const SolvAttr SolvAttr::patchcategory ( SOLVABLE_PATCHCATEGORY );

Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.h
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.h?rev=10642&r1=10641&r2=10642&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.h (original)
+++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/sat/SolvAttr.h Tue Jul 22
15:25:32 2008
@@ -42,9 +42,9 @@
static const SolvAttr noAttr;

/** \name special solvable attributes which are part of the ::Solvable
struct
- *
+ *
* \todo can these be used in LookupAttr currently?
- * \todo add dependencies here? Or move all this stuff elsewhere?
+ * \todo add dependencies here? Or move all this stuff elsewhere?
*/
//@{
static const SolvAttr name;
@@ -87,6 +87,7 @@
static const SolvAttr sourcename;
static const SolvAttr sourceevr;
static const SolvAttr headerend;
+ static const SolvAttr url;
//@}

/** \name patch */

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

< Previous Next >
This Thread
  • No further messages