# HG changeset patch # User Kristian H?gsberg # Date 1207545553 14400 # Node ID 1808497009656608c73c40a90307791c04042a95 # Parent 4c4955871c218cefe4c7ff71a632ca12cb9fd4bb Skip epoch prefix when creating filenames/urls. diff -r 4c4955871c21 -r 180849700965 main.c --- a/main.c Mon Apr 07 01:06:09 2008 -0400 +++ b/main.c Mon Apr 07 01:19:13 2008 -0400 @@ -479,14 +479,22 @@ void *data) { char file[PATH_MAX], url[256]; + const char *v; if (old_version) return; + /* Skip epoch */ + v = strchr(new_version, ':'); + if (v != NULL) + v = v + 1; + else + v = new_version; + snprintf(url, sizeof url, - REPO_URL "/Packages/%s-%s.%s.rpm", name, new_version, arch); + REPO_URL "/Packages/%s-%s.%s.rpm", name, v, arch); snprintf(file, sizeof file, - "rpms/%s-%s.%s.rpm", name, new_version, arch); + "rpms/%s-%s.%s.rpm", name, v, arch); if (download_if_missing(url, file) < 0) fprintf(stderr, "failed to download %s\n", name); } @@ -498,7 +506,7 @@ const char *arch, void *data) { - const char *root = data; + const char *v, *root = data; char file[PATH_MAX]; struct razor_rpm *rpm; @@ -507,9 +515,15 @@ return; } - printf("install %s %s\n", name, new_version); - snprintf(file, sizeof file, - "rpms/%s-%s.%s.rpm", name, new_version, arch); + /* Skip epoch */ + v = strchr(new_version, ':'); + if (v != NULL) + v = v + 1; + else + v = new_version; + + printf("install %s %s\n", name, v); + snprintf(file, sizeof file, "rpms/%s-%s.%s.rpm", name, v, arch); rpm = razor_rpm_open(file); if (rpm == NULL) {