0630406 Rename the error code to make it clear it's about the repo *schema* version. — HardenedBSD-pkg

HardenedBSD Package Manager

Rename the error code to make it clear it's about the repo *schema* version.

Matthew Seaman committed 13 years ago

commit 0630406c98bb4b933f98137d052f12925d1c05f1
parent 56711edf84f678ff6cc5e1a478a1b4c95518c4cb

3 files changed +4 -4

modified libpkg/pkg.h

@@ -315,7 +315,7 @@ typedef enum {

 	/**
 	 * repo DB schema incompatible version
 	 */
 	EPKG_REPOVERSION,
 	EPKG_REPOSCHEMA,
 } pkg_error_t;
 /**

modified libpkg/pkg_repo.c

@@ -848,7 +848,7 @@ pkg_check_repo_version(struct pkgdb *db, const char *database)

 		pkg_emit_error("Repo %s (schema version %d) is too old - need at "
 			       "least schema %d", database, reposcver,
 			       REPO_SCHEMA_VERSION);
 		return (EPKG_REPOVERSION);
 		return (EPKG_REPOSCHEMA);
 	}
 	repomajor = reposcver / 1000;

@@ -857,7 +857,7 @@ pkg_check_repo_version(struct pkgdb *db, const char *database)

 		pkg_emit_error("Repo %s (schema version %d) is too new - we can "
 			       "accept at most version %d", database, reposcver,
 			       (REPO_SCHEMA_MAJOR + 1) * 1000 - 1);
 		return (EPKG_REPOVERSION);
 		return (EPKG_REPOSCHEMA);
 	}
 	return (EPKG_OK);

modified libpkg/pkgdb.c

@@ -740,7 +740,7 @@ pkgdb_open(struct pkgdb **db_p, pkgdb_t type)

 					pkgdb_close(db);
 					return (EPKG_FATAL);
 					break;
 				case EPKG_REPOVERSION:
 				case EPKG_REPOSCHEMA:
 					if (sql_exec(db->sqlite, "DETACH DATABSE '%q'", repo_name) != EPKG_OK) {
 						pkgdb_close(db);
 						return (EPKG_FATAL);