Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7648 - in /branches/SuSE-SLE-10-SP2-Branch/libzypp: package/libzypp.changes zypp/target/rpm/RpmHeader.cc
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Fri, 26 Oct 2007 13:34:23 -0000
  • Message-id: <20071026133424.0FCDB17357@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Fri Oct 26 15:34:23 2007
New Revision: 7648

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7648&view=rev
Log:
- fixed retrieval of epoch from rpmdb (bug #246680)

Modified:
branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes
branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc

Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes?rev=7648&r1=7647&r2=7648&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Fri Oct 26
15:34:23 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Oct 26 15:33:01 CEST 2007 - aschnell@xxxxxxx
+
+- fixed retrieval of epoch from rpmdb (bug #246680)
+
+-------------------------------------------------------------------
Fri Oct 12 12:36:49 CEST 2007 - ma@xxxxxxx

- SMBIOS DMI modalias matching added (#333152)

Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc?rev=7648&r1=7647&r2=7648&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc
(original)
+++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/target/rpm/RpmHeader.cc Fri
Oct 26 15:34:23 2007
@@ -12,6 +12,7 @@
#include "librpm.h"

#include <iostream>
+#include <sstream>
#include <map>
#include <set>
#include <vector>
@@ -171,7 +172,12 @@
//
string RpmHeader::tag_epoch() const
{
- return string_val ( RPMTAG_EPOCH );
+ int epoch = int_val ( RPMTAG_EPOCH );
+ if (epoch == 0)
+ return "";
+ std::ostringstream tmp;
+ tmp << epoch;
+ return tmp.str();
}

///////////////////////////////////////////////////////////////////

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

< Previous Next >
This Thread
  • No further messages