Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11691 - in /trunk/sat-solver: VERSION.cmake package/libsatsolver.changes tools/repo_content.c
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Mon, 17 Nov 2008 13:52:45 -0000
  • Message-id: <20081117135245.A595B27CAC@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Mon Nov 17 14:52:45 2008
New Revision: 11691

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11691&view=rev
Log:
- Parse RELEASE tag from contentfile (bnc #444978)

Modified:
trunk/sat-solver/VERSION.cmake
trunk/sat-solver/package/libsatsolver.changes
trunk/sat-solver/tools/repo_content.c

Modified: trunk/sat-solver/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=11691&r1=11690&r2=11691&view=diff
==============================================================================
--- trunk/sat-solver/VERSION.cmake (original)
+++ trunk/sat-solver/VERSION.cmake Mon Nov 17 14:52:45 2008
@@ -46,6 +46,6 @@

SET(LIBSATSOLVER_MAJOR "0")
SET(LIBSATSOLVER_MINOR "12")
-SET(LIBSATSOLVER_PATCH "2")
+SET(LIBSATSOLVER_PATCH "3")

# last released 0.12.2

Modified: trunk/sat-solver/package/libsatsolver.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=11691&r1=11690&r2=11691&view=diff
==============================================================================
--- trunk/sat-solver/package/libsatsolver.changes (original)
+++ trunk/sat-solver/package/libsatsolver.changes Mon Nov 17 14:52:45 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Nov 17 14:30:08 CET 2008 - ma@xxxxxxx
+
+- Parse RELEASE tag from contentfile (bnc #444978)
+- 0.12.3
+
+-------------------------------------------------------------------
Fri Nov 14 18:00:19 CET 2008 - mls@xxxxxxx

- fix bugs in multiversion handling

Modified: trunk/sat-solver/tools/repo_content.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?rev=11691&r1=11690&r2=11691&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_content.c (original)
+++ trunk/sat-solver/tools/repo_content.c Mon Nov 17 14:52:45 2008
@@ -24,7 +24,8 @@
#include "repo.h"
#include "util.h"
#include "repo_content.h"
-
+#define DISABLE_SPLIT
+#include "tools_util.h"

/* split off a word, return null terminated pointer to it.
* return NULL if there is no word left. */
@@ -50,16 +51,10 @@
Repo *repo;
char *tmp;
int tmpl;
-};
-

-static Id
-makeevr(Pool *pool, char *s)
-{
- if (!strncmp(s, "0:", 2) && s[2])
- s += 2;
- return str2id(pool, s, 1);
-}
+ const char *tmpvers;
+ const char *tmprel;
+};

/*
* dependency relations
@@ -322,7 +317,9 @@
}

if (istag ("VERSION"))
- s->evr = makeevr(pool, value);
+ pd.tmpvers = strdup(value);
+ else if (istag ("RELEASE"))
+ pd.tmprel = strdup(value);
else if (code11 && istag ("DISTRIBUTION"))
repo_set_str(repo, s - pool->solvables, SOLVABLE_DISTRIBUTION,
value);
else if (istag ("DATADIR"))
@@ -416,6 +413,20 @@
exit(1);
}

+ if (pd.tmpvers)
+ {
+ if (pd.tmprel)
+ s->evr = makeevr(pool, join2(pd.tmpvers, "-", pd.tmprel));
+ else
+ s->evr = makeevr(pool, pd.tmpvers);
+ }
+ else if (pd.tmprel)
+ {
+ s->evr = makeevr(pool, join2("", "-", pd.tmprel));
+ }
+ pd.tmpvers = sat_free((void *)pd.tmpvers);
+ pd.tmprel = sat_free((void *)pd.tmprel);
+
if (!s->arch)
s->arch = ARCH_NOARCH;
if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)

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

< Previous Next >
This Thread
  • No further messages