diff options
author | Jan Rękorajski | 2019-01-05 01:35:08 (GMT) |
---|---|---|
committer | Jan Rękorajski | 2019-01-05 01:35:08 (GMT) |
commit | 0edb3c555c428adadef520415aa83fa2e23f4e66 (patch) | |
tree | c6633a4a57956575370c2addbea91c96fcd5b112 | |
parent | 473a62fc83595434b1f625acbfafed6487ca2c7c (diff) | |
download | pld-ftp-admin-0edb3c555c428adadef520415aa83fa2e23f4e66.zip pld-ftp-admin-0edb3c555c428adadef520415aa83fa2e23f4e66.tar.gz |
Cleanup duplicate conditionals
-rwxr-xr-x | wwwbin/ftp-freshness.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/wwwbin/ftp-freshness.py b/wwwbin/ftp-freshness.py index 6bb190f..7af8122 100755 --- a/wwwbin/ftp-freshness.py +++ b/wwwbin/ftp-freshness.py @@ -85,14 +85,12 @@ class Pkgs(object): cvs_rpm_vr = rpm.labelCompare(cvs_nvr, pkg_nvr) cvs_rpm_v = rpm.labelCompare((cvs_nvr[0], cvs_nvr[1], ""), (pkg_nvr[0], pkg_nvr[1], "")) - rpm_cvs_vr = rpm.labelCompare(pkg_nvr, cvs_nvr) - rpm_cvs_v = rpm.labelCompare((pkg_nvr[0], pkg_nvr[1], ""), (cvs_nvr[0], cvs_nvr[1], "")) - if rpm_cvs_v < 0 and cvs_rpm_v > 0: + if cvs_rpm_v > 0: self.cvs_new_nv.append(name) - else: - if rpm_cvs_vr < 0 and cvs_rpm_vr > 0 and cvs_nvr[1] == pkg_nvr[1]: - self.cvs_new_nvr.append(name) + return + if cvs_rpm_vr > 0: + self.cvs_new_nvr.append(name) def prepare(self): self.cvs_new_nvr.sort() |