diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-22 10:03:51 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-22 10:03:51 -0600 |
| commit | 51175f31c4aac9df6ceeffc7855a0f842c580fdb (patch) | |
| tree | 4fe5405a24aa967572f407dafbbee9231a25b0dc /lib/libalpm/be_sync.c | |
| parent | e277e838d798c1463ae5df98dcf637df70e048ec (diff) | |
| parent | 859bdb5b1d1b9ccb781c95026836283a005a96ce (diff) | |
| download | pacman-51175f31c4aac9df6ceeffc7855a0f842c580fdb.tar.xz | |
Merge branch 'epoch-work'
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) { |