From: Michael Tremer Date: Thu, 11 Feb 2021 11:06:35 +0000 (+0000) Subject: package: Rename pakfire_package_create2 to pakfire_package_create X-Git-Tag: 0.9.28~1285^2~769 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71cc0c7e032a03bbe4b5d7c67f8aa48bf017288;p=pakfire.git package: Rename pakfire_package_create2 to pakfire_package_create Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/repo.c b/src/_pakfire/repo.c index 40335260f..169fd19c0 100644 --- a/src/_pakfire/repo.c +++ b/src/_pakfire/repo.c @@ -301,7 +301,7 @@ static PyObject* Repo__add_package(RepoObject* self, PyObject* args) { return NULL; Pakfire pakfire = pakfire_repo_get_pakfire(self->repo); - PakfirePackage pkg = pakfire_package_create2(pakfire, self->repo, name, evr, arch); + PakfirePackage pkg = pakfire_package_create(pakfire, self->repo, name, evr, arch); PyObject* obj = new_package(&PackageType, pkg); diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index e2ad8bf3c..8c580f5cc 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1261,7 +1261,7 @@ PAKFIRE_EXPORT PakfirePackage pakfire_archive_make_package(PakfireArchive archiv char* r = pakfire_archive_get(archive, "package.release"); char* evr = pakfire_package_join_evr(e, v, r); - PakfirePackage pkg = pakfire_package_create2( + PakfirePackage pkg = pakfire_package_create( archive->pakfire, repo, name, evr, (arch) ? arch : "src" ); diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c index 4acde24b0..0475c9cd8 100644 --- a/src/libpakfire/db.c +++ b/src/libpakfire/db.c @@ -1398,7 +1398,7 @@ static int pakfire_db_load_package(struct pakfire_db* db, PakfireRepo repo, sqli } // Create package - pkg = pakfire_package_create2(db->pakfire, repo, name, evr, arch); + pkg = pakfire_package_create(db->pakfire, repo, name, evr, arch); if (!pkg) { ERROR(db->pakfire, "Could not create package\n"); goto ERROR; diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index 48ab07a5c..e72c20589 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -29,7 +29,7 @@ #include PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id); -PakfirePackage pakfire_package_create2(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch); +PakfirePackage pakfire_package_create(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch); PakfirePackage pakfire_package_ref(PakfirePackage pkg); PakfirePackage pakfire_package_unref(PakfirePackage pkg); diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 53d96fafc..7ef1797a1 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -157,8 +157,8 @@ global: pakfire_package_add_requires; pakfire_package_add_suggests; pakfire_package_cmp; + pakfire_package_create; pakfire_package_create_from_solvable; - pakfire_package_create2; pakfire_package_dump; pakfire_package_get_arch; pakfire_package_get_buildhost; diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index dbbc33149..1fad60c81 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -77,7 +77,7 @@ PAKFIRE_EXPORT PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfi return pkg; } -PAKFIRE_EXPORT PakfirePackage pakfire_package_create2(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch) { +PAKFIRE_EXPORT PakfirePackage pakfire_package_create(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch) { Id id = pakfire_repo_add_solvable(repo); if (!id) return NULL;