diff options
| author | Jonathan Dieter <jdieter@gmail.com> | 2007-03-30 10:52:57 +0300 |
|---|---|---|
| committer | Jonathan Dieter <jdieter@gmail.com> | 2007-03-30 10:52:57 +0300 |
| commit | 20a630be934db6374ace720e473beb1ec05e31fc (patch) | |
| tree | 6f21e5c12cc7abc933c4418f1ca0703acd1c26f9 | |
| parent | 5ea857b0e948b687785b8e55e08866c6171fb715 (diff) | |
| download | presto-20a630be934db6374ace720e473beb1ec05e31fc.tar.gz presto-20a630be934db6374ace720e473beb1ec05e31fc.tar.xz presto-20a630be934db6374ace720e473beb1ec05e31fc.zip | |
Change how sequence is stored in presto.xml.gz to enhance accuracy.
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
| -rw-r--r-- | yum-presto/ChangeLog | 7 | ||||
| -rw-r--r-- | yum-presto/shared/prestoTransaction.py | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/yum-presto/ChangeLog b/yum-presto/ChangeLog index 7f57c2a..cd39780 100644 --- a/yum-presto/ChangeLog +++ b/yum-presto/ChangeLog @@ -1,4 +1,9 @@ -* Thu Mar 29 2007 Jonathan Dieter <jdieter@gmail.com> - 0.3.1 +* Fri Mar 30 2007 Jonathan Dieter <jdieter@gmail.com> - 0.3.3 + - Change to how presto.xml.gz stores sequence. An attempt to + save space doesn't always work, so get rid of it. + +* Thu Mar 29 2007 Jonathan Dieter <jdieter@gmail.com> - 0.3.2 + - Minor fixes to make rpmlint happy - Minor fix so yum doesn't die when download fails - Minor fix to allow public keys to be imported properly - Update README diff --git a/yum-presto/shared/prestoTransaction.py b/yum-presto/shared/prestoTransaction.py index 3d387a4..166fe6d 100644 --- a/yum-presto/shared/prestoTransaction.py +++ b/yum-presto/shared/prestoTransaction.py @@ -79,16 +79,16 @@ def find_available_drpms(conduit, newpkg): # Get sequence code for drpm sequence = p_repo.deltalist[key]['sequence'] - if int(oldpkg.epoch) == 0: - seq = "%s-%s-%s-%s" % (oldpkg.name, oldpkg.version, oldpkg.release, sequence) - else: - seq = "%s-%i:%s-%s-%s" % (oldpkg.name, int(oldpkg.epoch), oldpkg.version, oldpkg.release, sequence) +# if int(oldpkg.epoch) == 0: # Don't try to save space on sequence anymore. It just won't work. +# seq = "%s-%s-%s-%s" % (oldpkg.name, oldpkg.version, oldpkg.release, sequence) +# else: +# seq = "%s-%i:%s-%s-%s" % (oldpkg.name, int(oldpkg.epoch), oldpkg.version, oldpkg.release, sequence) drpm = deltarpm.DeltaRpmWrapper(conduit) # Attempt to apply sequence code for drpm. If this fails, drpm will not apply cleanly, so # don't even try to download it. try: - drpm.verifySequence(seq) + drpm.verifySequence(sequence) chosen_drpm = p_repo.deltalist[key] chosen_drpm['baseurl'] = p_repo.baseurl[0] except: |