1.1 --- a/plover/repository.c Thu Jun 16 12:11:14 2016 +0100
1.2 +++ b/plover/repository.c Thu Jun 16 18:00:21 2016 +0100
1.3 @@ -102,7 +102,7 @@
1.4 return g_strconcat(name,"-",v,".",arch,".rpm",NULL);
1.5 }
1.6
1.7 -PloverRepository *plover_repository_new_from_yum(const char *base,
1.8 +PloverRepository *plover_repository_new_from_yum_uri(const char *base_uri,
1.9 GError **error)
1.10 {
1.11 char *s;
1.12 @@ -114,15 +114,9 @@
1.13 PloverPackageSet *set;
1.14 PloverRepository *repository;
1.15 PloverRepositoryPrivate *priv;
1.16 - GFile *file;
1.17 - gchar *uri;
1.18 - imported=plover_razor_set_create_from_yum(base,error);
1.19 + imported=plover_razor_set_create_from_yum_uri(base_uri,error);
1.20 if (!imported)
1.21 return NULL;
1.22 - file=g_file_new_for_path(base);
1.23 - uri=g_file_get_uri(file);
1.24 - g_object_unref(file);
1.25 - g_message("Using %s as URI",uri);
1.26 set=plover_package_set_new_from_razor(imported);
1.27 razor_set_unref(imported);
1.28 repository=g_object_new(PLOVER_TYPE_REPOSITORY,NULL);
1.29 @@ -133,14 +127,27 @@
1.30 RAZOR_DETAIL_VERSION,&version,RAZOR_DETAIL_ARCH,&arch,RAZOR_DETAIL_LAST))
1.31 {
1.32 s=rpm_filename(name,version,arch);
1.33 - g_ptr_array_add(uris,g_build_filename(uri,"rpms",s,NULL));
1.34 + g_ptr_array_add(uris,g_build_filename(base_uri,"rpms",s,NULL));
1.35 free(s);
1.36 }
1.37 razor_package_iterator_destroy(pi);
1.38 g_ptr_array_add(uris,NULL);
1.39 priv->uris=(gchar **)g_ptr_array_free(uris,FALSE);
1.40 priv->set=set;
1.41 - g_free(uri);
1.42 + return repository;
1.43 +}
1.44 +
1.45 +PloverRepository *plover_repository_new_from_yum(const char *base,
1.46 + GError **error)
1.47 +{
1.48 + PloverRepository *repository;
1.49 + gchar *base_uri;
1.50 + GFile *file;
1.51 + file=g_file_new_for_path(base);
1.52 + base_uri=g_file_get_uri(file);
1.53 + g_object_unref(file);
1.54 + repository=plover_repository_new_from_yum_uri(base_uri,error);
1.55 + g_free(base_uri);
1.56 return repository;
1.57 }
1.58