Skip epoch prefix when creating filenames/urls.
1.1 --- a/main.c Mon Apr 07 01:06:09 2008 -0400
1.2 +++ b/main.c Mon Apr 07 01:19:13 2008 -0400
1.3 @@ -479,14 +479,22 @@
1.4 void *data)
1.5 {
1.6 char file[PATH_MAX], url[256];
1.7 + const char *v;
1.8
1.9 if (old_version)
1.10 return;
1.11
1.12 + /* Skip epoch */
1.13 + v = strchr(new_version, ':');
1.14 + if (v != NULL)
1.15 + v = v + 1;
1.16 + else
1.17 + v = new_version;
1.18 +
1.19 snprintf(url, sizeof url,
1.20 - REPO_URL "/Packages/%s-%s.%s.rpm", name, new_version, arch);
1.21 + REPO_URL "/Packages/%s-%s.%s.rpm", name, v, arch);
1.22 snprintf(file, sizeof file,
1.23 - "rpms/%s-%s.%s.rpm", name, new_version, arch);
1.24 + "rpms/%s-%s.%s.rpm", name, v, arch);
1.25 if (download_if_missing(url, file) < 0)
1.26 fprintf(stderr, "failed to download %s\n", name);
1.27 }
1.28 @@ -498,7 +506,7 @@
1.29 const char *arch,
1.30 void *data)
1.31 {
1.32 - const char *root = data;
1.33 + const char *v, *root = data;
1.34 char file[PATH_MAX];
1.35 struct razor_rpm *rpm;
1.36
1.37 @@ -507,9 +515,15 @@
1.38 return;
1.39 }
1.40
1.41 - printf("install %s %s\n", name, new_version);
1.42 - snprintf(file, sizeof file,
1.43 - "rpms/%s-%s.%s.rpm", name, new_version, arch);
1.44 + /* Skip epoch */
1.45 + v = strchr(new_version, ':');
1.46 + if (v != NULL)
1.47 + v = v + 1;
1.48 + else
1.49 + v = new_version;
1.50 +
1.51 + printf("install %s %s\n", name, v);
1.52 + snprintf(file, sizeof file, "rpms/%s-%s.%s.rpm", name, v, arch);
1.53
1.54 rpm = razor_rpm_open(file);
1.55 if (rpm == NULL) {