summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-09-26 13:26:08 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-09-26 13:26:08 +0900
commitc331c1f10535b12f436d7f22497577a892620a29 (patch)
tree4faf79541720079fc2b610073cf4a1d3f113ceb2
parent986ae7e70f46d8ca33d97a09bedc83a8443d0a72 (diff)
make get and getsrc actually work with new arch info
-rw-r--r--mrk-srv.c8
-rw-r--r--mrk.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/mrk-srv.c b/mrk-srv.c
index 106d9b1..6dfa0f9 100644
--- a/mrk-srv.c
+++ b/mrk-srv.c
@@ -180,6 +180,7 @@ client_send(Client *c, const char *name)
180 char tmp[4096]; 180 char tmp[4096];
181 char *lnk; 181 char *lnk;
182 182
183 printf("C arch: %s\n", c->arch);
183 if (!c->arch) return; 184 if (!c->arch) return;
184 snprintf(tmp, sizeof(tmp), "%s/%s/%s", repodir, c->arch, name); 185 snprintf(tmp, sizeof(tmp), "%s/%s/%s", repodir, c->arch, name);
185 lnk = ecore_file_readlink(tmp); 186 lnk = ecore_file_readlink(tmp);
@@ -248,7 +249,11 @@ client_src_send(Client *c, const char *name)
248static int 249static int
249arch_ok(const char *arch) 250arch_ok(const char *arch)
250{ 251{
251 if (!strcmp(arch, "x86_64-linux")) return 1; 252 if (!strcmp(arch, "linux-x86_64")) return 1;
253 if (!strcmp(arch, "linux-ix86")) return 1;
254 if (!strcmp(arch, "linux-arm")) return 1;
255 if (!strcmp(arch, "linux-ppc64")) return 1;
256 if (!strcmp(arch, "linux-ppc")) return 1;
252 return 0; 257 return 0;
253} 258}
254 259
@@ -375,6 +380,7 @@ _ipc_cb_dat(void *data, int type, void *event)
375 { 380 {
376 memcpy(arch, e->data, e->size); 381 memcpy(arch, e->data, e->size);
377 arch[e->size] = 0; 382 arch[e->size] = 0;
383 printf("set arch %s\n", arch);
378 if (arch_ok(arch)) 384 if (arch_ok(arch))
379 { 385 {
380 if (c->arch) free(c->arch); 386 if (c->arch) free(c->arch);
diff --git a/mrk.c b/mrk.c
index 7e51007..bb8e0d5 100644
--- a/mrk.c
+++ b/mrk.c
@@ -1255,7 +1255,7 @@ _ipc3_cb_add(void *data, int type, void *event)
1255 eina_version->major, eina_version->minor, eina_version->micro); 1255 eina_version->major, eina_version->minor, eina_version->micro);
1256 ecore_ipc_server_send(ipc, 10, M_ID_VERSION, 0, 0, 0, 1256 ecore_ipc_server_send(ipc, 10, M_ID_VERSION, 0, 0, 0,
1257 tmp, strlen(tmp)); 1257 tmp, strlen(tmp));
1258 ecore_ipc_server_send(ipc, 10, M_QRY_GET, 0, 0, 0, 1258 ecore_ipc_server_send(ipc, 10, M_QRY_GETSRC, 0, 0, 0,
1259 downsrc_name, strlen(downsrc_name)); 1259 downsrc_name, strlen(downsrc_name));
1260 return EINA_TRUE; 1260 return EINA_TRUE;
1261} 1261}