]> git.ipfire.org Git - pakfire.git/commitdiff
parser: Use special "evr" variable
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 May 2022 15:01:37 +0000 (15:01 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 May 2022 15:01:37 +0000 (15:01 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/parser.c

index c8bcbd178124404527a0a3f8c5ce7b2a8ed66496..54fb50aa247660d6f34fac4efde13cfbe8816768 100644 (file)
@@ -879,11 +879,8 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
        int r = 1;
 
        char* name = NULL;
-       char* epoch = NULL;
-       char* version = NULL;
-       char* release = NULL;
-       char* arch = NULL;
        char* evr = NULL;
+       char* arch = NULL;
 
        DEBUG(parser->pakfire, "Building package from namespace '%s'\n", namespace);
 
@@ -894,24 +891,10 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
                goto CLEANUP;
        }
 
-       // Fetch epoch
-       epoch = pakfire_parser_get(parser, namespace, "epoch");
-       if (!epoch || !*epoch) {
-               ERROR(parser->pakfire, "Epoch is empty\n");
-               goto CLEANUP;
-       }
-
-       // Fetch version
-       version = pakfire_parser_get(parser, namespace, "version");
-       if (!version || !*version) {
-               ERROR(parser->pakfire, "Version is empty\n");
-               goto CLEANUP;
-       }
-
-       // Fetch release
-       release = pakfire_parser_get(parser, namespace, "release");
-       if (!release || !*release) {
-               ERROR(parser->pakfire, "Release is empty\n");
+       // Fetch EVR
+       evr = pakfire_parser_get(parser, namespace, "evr");
+       if (!evr || !*evr) {
+               ERROR(parser->pakfire, "EVR is empty\n");
                goto CLEANUP;
        }
 
@@ -928,11 +911,6 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
                }
        }
 
-       // Compile EVR
-       evr = pakfire_package_join_evr(epoch, version, release);
-       if (!evr)
-               goto CLEANUP;
-
        // Create a new package object
        *pkg = pakfire_package_create(parser->pakfire, repo, name, evr, arch);
        if (!*pkg) {
@@ -1022,12 +1000,8 @@ int pakfire_parser_create_package(struct pakfire_parser* parser,
 CLEANUP:
        if (name)
                free(name);
-       if (epoch)
-               free(epoch);
-       if (version)
-               free(version);
-       if (release)
-               free(release);
+       if (evr)
+               free(evr);
        if (arch)
                free(arch);