Author: dmacvicar
Date: Tue Jul 1 00:00:15 2008
New Revision: 10488
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10488&view=rev
Log:
forward ports from 11.0 branch
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
trunk/libzypp/tests/zypp/PublicKey_test.cc
trunk/libzypp/zypp/PublicKey.cc
trunk/libzypp/zypp/ResStatus.h
trunk/libzypp/zypp/sat/SolvAttr.cc
trunk/sat-solver/package/libsatsolver.changes
trunk/sat-solver/src/knownid.h
trunk/sat-solver/tools/repo_updateinfoxml.c
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Tue Jul 1 00:00:15 2008
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "5")
SET(LIBZYPP_MINOR "0")
SET(LIBZYPP_COMPATMINOR "0")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Jul 1 00:00:15 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jun 30 23:55:20 CEST 2008 - dmacvicar@suse.de
+
+- forward port add message attribute to patches.
+- version 5.0.2
+
+-------------------------------------------------------------------
Mon Jun 30 10:28:27 CEST 2008 - ma@suse.de
- Fix permanent duplication of gpg keys in the rpm database. Also
Modified: trunk/libzypp/tests/zypp/PublicKey_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PublicKey_test.cc?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/PublicKey_test.cc (original)
+++ trunk/libzypp/tests/zypp/PublicKey_test.cc Tue Jul 1 00:00:15 2008
@@ -8,6 +8,7 @@
#include "zypp/base/Exception.h"
#include "zypp/PublicKey.h"
#include "zypp/TmpPath.h"
+#include "zypp/Date.h"
#include
@@ -254,6 +255,7 @@
BOOST_CHECK_EQUAL( k2.id(), "A84EDAE89C800ACA" );
BOOST_CHECK_EQUAL( k2.name(), "SuSE Package Signing Key " );
BOOST_CHECK_EQUAL( k2.fingerprint(), "79C179B2E1C820C1890F9994A84EDAE89C800ACA" );
+ BOOST_CHECK_EQUAL( k2.created(), zypp::Date(1087899198) );
BOOST_REQUIRE( k2.path() != Pathname() );
BOOST_REQUIRE( k2 == k2 );
// test for a empty key
Modified: trunk/libzypp/zypp/PublicKey.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PublicKey.cc?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/zypp/PublicKey.cc (original)
+++ trunk/libzypp/zypp/PublicKey.cc Tue Jul 1 00:00:15 2008
@@ -217,10 +217,7 @@
PublicKey::PublicKey( const Pathname &file )
: _pimpl( new Impl(file) )
- {
- MIL << *this << endl;
- }
-
+ {}
///////////////////////////////////////////////////////////////////
//
// METHOD NAME : PublicKey::~PublicKey
Modified: trunk/libzypp/zypp/ResStatus.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResStatus.h (original)
+++ trunk/libzypp/zypp/ResStatus.h Tue Jul 1 00:00:15 2008
@@ -398,17 +398,17 @@
{
if ( toTansact_r == transacts() )
{
- // we're already in the desired state, but
- // remember a superior causer.
- if ( isLessThan<TransactByField>( causer_r ) )
+ // we're already in the desired state, but in case of
+ // TRANSACT, remember a superior causer.
+ if ( transacts() && isLessThan<TransactByField>( causer_r ) )
fieldValueAssign<TransactByField>( causer_r );
fieldValueAssign<TransactDetailField>( NO_DETAIL ); // Details has to be set again
return true;
}
// Here: transact status is to be changed:
- if ( ! fieldValueIs<TransactField>( KEEP_STATE )
- && isGreaterThan<TransactByField>( causer_r ) ) {
+ if ( ! fieldValueIs<TransactField>( KEEP_STATE )
+ && isGreaterThan<TransactByField>( causer_r ) ) {
return false;
}
Modified: trunk/libzypp/zypp/sat/SolvAttr.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/SolvAttr.cc (original)
+++ trunk/libzypp/zypp/sat/SolvAttr.cc Tue Jul 1 00:00:15 2008
@@ -73,9 +73,7 @@
const SolvAttr SolvAttr::patchcategory ( SOLVABLE_PATCHCATEGORY );
const SolvAttr SolvAttr::rebootSuggested ( UPDATE_REBOOT );
const SolvAttr SolvAttr::restartSuggested ( UPDATE_RESTART );
-#warning fix if UPDATE_MESSAGE is ported to satsolver
- const SolvAttr SolvAttr::message ( "update:message" /*UPDATE_MESSAGE*/ );
-
+ const SolvAttr SolvAttr::message ( UPDATE_MESSAGE );
const SolvAttr SolvAttr::updateCollectionName ( UPDATE_COLLECTION_NAME );
const SolvAttr SolvAttr::updateCollectionEvr ( UPDATE_COLLECTION_EVR );
const SolvAttr SolvAttr::updateCollectionArch ( UPDATE_COLLECTION_ARCH );
Modified: trunk/sat-solver/package/libsatsolver.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/sat-solver/package/libsatsolver.changes (original)
+++ trunk/sat-solver/package/libsatsolver.changes Tue Jul 1 00:00:15 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Jun 30 23:55:20 CEST 2008 - dmacvicar@suse.de
+
+- forward port
+- add message tag to updateinfo.xml for displaying
+ messages in the user interface
+- Fix missing self provides for patches (bnc #397132).
+
+-------------------------------------------------------------------
Mon Jun 2 11:47:32 CEST 2008 - coolo@suse.de
- calculate recommendation list also if ignorealreadyrecommended is set,
Modified: trunk/sat-solver/src/knownid.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/sat-solver/src/knownid.h (original)
+++ trunk/sat-solver/src/knownid.h Tue Jul 1 00:00:15 2008
@@ -126,6 +126,7 @@
KNOWNID(UPDATE_REBOOT, "update:reboot"), /* reboot suggested (kernel update) */
KNOWNID(UPDATE_RESTART, "update:restart"), /* restart suggested (update stack update) */
+KNOWNID(UPDATE_MESSAGE, "update:message"), /* restart suggested (update stack update) */
/* 'content' of patch, usually list of packages */
KNOWNID(UPDATE_COLLECTION, "update:collection"), /* "name evr arch" */
KNOWNID(UPDATE_COLLECTION_NAME, "update:collection:name"), /* name */
Modified: trunk/sat-solver/tools/repo_updateinfoxml.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=10488&r1=10487&r2=10488&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_updateinfoxml.c (original)
+++ trunk/sat-solver/tools/repo_updateinfoxml.c Tue Jul 1 00:00:15 2008
@@ -53,16 +53,17 @@
STATE_TITLE, /* 4 */
STATE_RELEASE, /* 5 */
STATE_ISSUED, /* 6 */
- STATE_REFERENCES, /* 7 */
- STATE_REFERENCE, /* 8 */
- STATE_DESCRIPTION, /* 9 */
- STATE_PKGLIST, /* 10 */
- STATE_COLLECTION, /* 11 */
- STATE_NAME, /* 12 */
- STATE_PACKAGE, /* 13 */
- STATE_FILENAME, /* 14 */
- STATE_REBOOT, /* 15 */
- STATE_RESTART, /* 16 */
+ STATE_MESSAGE, /* 7 */
+ STATE_REFERENCES, /* 8 */
+ STATE_REFERENCE, /* 9 */
+ STATE_DESCRIPTION, /* 10 */
+ STATE_PKGLIST, /* 11 */
+ STATE_COLLECTION, /* 12 */
+ STATE_NAME, /* 13 */
+ STATE_PACKAGE, /* 14 */
+ STATE_FILENAME, /* 15 */
+ STATE_REBOOT, /* 16 */
+ STATE_RESTART, /* 17 */
NUMSTATES
};
@@ -84,6 +85,7 @@
{ STATE_UPDATE, "release", STATE_RELEASE, 1 },
{ STATE_UPDATE, "issued", STATE_ISSUED, 1 },
{ STATE_UPDATE, "description", STATE_DESCRIPTION, 1 },
+ { STATE_UPDATE, "message", STATE_MESSAGE , 1 },
{ STATE_UPDATE, "references", STATE_REFERENCES, 0 },
{ STATE_UPDATE, "pkglist", STATE_PKGLIST, 0 },
{ STATE_REFERENCES, "reference", STATE_REFERENCE, 0 },
@@ -111,6 +113,7 @@
Solvable *solvable;
unsigned int timestamp;
+
struct stateswitch *swtab[NUMSTATES];
enum state sbtab[NUMSTATES];
char *tempstr;
@@ -122,6 +125,7 @@
* if we have seen a <filename>...
* inside of <package>...
*
+ *
* If not, we must insert an empty filename to UPDATE_COLLECTION_FILENAME
* at </package> in order to keep all UPDATE_COLLECTION_* arrays in sync
*/
@@ -242,6 +246,7 @@
if (!strcmp(sw->ename, name))
break;
+
if (sw->from != pd->state)
{
#if 1
@@ -283,11 +288,14 @@
version = atts[1];
}
+
solvable = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
pd->datanum = (pd->solvable - pool->solvables) - pd->repo->start;
repodata_extend(pd->data, pd->solvable - pool->solvables);
+ repodata_extend(pd->data, pd->solvable - pool->solvables);
pd->datanum = repodata_get_handle(pd->data, pd->datanum);
+
solvable->vendor = str2id(pool, from, 1);
solvable->evr = str2id(pool, version, 1);
solvable->arch = ARCH_NOARCH;
@@ -348,6 +356,9 @@
/* <description>This update ...</description> */
case STATE_DESCRIPTION:
break;
+ /* <message type="confirm">This update ...</message> */
+ case STATE_MESSAGE:
+ break;
case STATE_PKGLIST:
break;
/* <collection short="F8"> */
@@ -360,6 +371,7 @@
* src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-deb..."
* version="1.9.15">
*
+ *
* -> patch.conflicts: {name} < {version}.{release}
*/
case STATE_PACKAGE:
@@ -369,10 +381,12 @@
Id n, a, na;
Id rel_id;
+
/* reset package_* markers, to be evaluated at </package> */
package_filename_seen = 0;
package_flags = 0;
+
for (; *atts; atts += 2)
{
if (!strcmp(*atts, "arch"))
@@ -391,6 +405,7 @@
/* now combine both to a single Id */
na = rel2id(pool, n, a, REL_ARCH, 1);
+
rel_id = rel2id(pool, na, evr, REL_LT, 1);
solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0);
@@ -415,6 +430,7 @@
}
break;
/* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */
+ /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */
case STATE_FILENAME:
break;
/* True */
@@ -439,6 +455,7 @@
struct parsedata *pd = userData;
Pool *pool = pd->pool;
Solvable *s = pd->solvable;
+ Repo *repo = pd->repo;
#if 0
fprintf(stderr, "end: %s\n", name);
@@ -461,6 +478,7 @@
case STATE_UPDATES:
break;
case STATE_UPDATE:
+ s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
break;
case STATE_ID:
{
@@ -500,6 +518,15 @@
repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content);
}
break;
+ break;
+ /*
+ * <message>Warning! ...</message>
+ */
+ case STATE_MESSAGE:
+ {
+ repodata_set_str(pd->data, pd->datanum, UPDATE_MESSAGE, pd->content);
+ }
+ break;
case STATE_PKGLIST:
break;
case STATE_COLLECTION:
@@ -521,6 +548,7 @@
}
break;
/* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */
+ /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */
case STATE_FILENAME:
{
#if DO_ARRAY
@@ -562,6 +590,7 @@
pd->state = pd->sbtab[pd->state];
pd->docontent = 0;
+
return;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
