Imported Upstream version 0.6.23

[platform/upstream/libsolv.git] / ext / repo_autopattern.c

diff --git a/ext/repo_autopattern.c b/ext/repo_autopattern.c
index 4c767e1..f6e1004 100644 (file)
--- a/ext/repo_autopattern.c
+++ b/ext/repo_autopattern.c
@@ -396,11 +396,10 @@ repo_add_autopattern(Repo *repo, int flags)
              repodata_set_str(data, h, PRODUCT_UPDATES_REPOID, newname);
              repodata_add_flexarray(data, s2 - pool->solvables, PRODUCT_UPDATES, h);
            }
-         else if (!strcmp(pn, "product-endoflife()") && evr)
+         else if (!strcmp(pn, "product-endoflife()"))
            {
-             time_t t = datestr2timestamp(newname);
-             if (t)
-               repodata_set_num(data, s2 - pool->solvables, PRODUCT_ENDOFLIFE, t);
+             /* FATE#320699: Support tri-state product-endoflife (tag absent, present but nodate(0), present + date) */
+             repodata_set_num(data, s2 - pool->solvables, PRODUCT_ENDOFLIFE,(evr ? datestr2timestamp(newname) : 0) );
            }
          else if (!strncmp(pn, "product-url(", 12) && evr && pn[12] && pn[13] && strlen(pn + 12) < 32)
            {