diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-10 20:40:31 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-22 02:30:45 +0100 |
| commit | bf46e04614b3740eea4a5e0d44767f57e1cffa4d (patch) | |
| tree | 4a1fb5d578a539e42a1d73de1b3d83edbf17a58a /lib/libalpm/be_sync.c | |
| parent | 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (diff) | |
| download | pacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.gz pacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.xz | |
Remove epoch as an independent field
Instead, go the same route we have always taken with version-release in
libalpm and treat it all as one piece of information. Makepkg is the only
script that knows about epoch as a distinct value; from there on out we will
parse out the components as necessary.
This makes the code a lot simpler as far as epoch handling goes. The
downside here is that we are tossing some compatibility to the wind;
packages using force will have to be rebuilt with an incremented epoch to
keep their special status.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/be_sync.c')
| -rw-r--r-- | lib/libalpm/be_sync.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 1e4b2fde..4676e8a6 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -340,15 +340,6 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%REPLACES%") == 0) { READ_AND_STORE_ALL(pkg->replaces); - } else if(strcmp(line, "%EPOCH%") == 0) { - READ_NEXT(line); - pkg->epoch = atoi(line); - } else if(strcmp(line, "%FORCE%") == 0) { - /* For backward compatibility, treat force as a non-zero epoch - * but only if we didn't already have a known epoch value. */ - if(!pkg->epoch) { - pkg->epoch = 1; - } } else if(strcmp(line, "%DEPENDS%") == 0) { /* Different than the rest because of the _alpm_splitdep call. */ while(1) { |