Martchus
/
repoindex
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix typo

This commit is contained in:
Martchus 2017-03-25 19:51:19 +01:00
parent 594409cc21
commit 4d3b32d56e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/alpm/package.cpp
View File

@ -118,11 +118,11 @@ bool Package::matches(const QString &name, const QString &version, const Depende
case DependencyMode::Equal:
return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::Equal;
case DependencyMode::GreatherEqual:
return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::NewerThenSyncVersion;
return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::NewerThanSyncVersion;
case DependencyMode::LessEqual:
return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::PackageUpgradeOnly || cmp == PackageVersionComparsion::SoftwareUpgrade;
case DependencyMode::GreatherThen:
return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::NewerThenSyncVersion;
return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::NewerThanSyncVersion;
case DependencyMode::LessThen:
return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::PackageUpgradeOnly || cmp == PackageVersionComparsion::SoftwareUpgrade;
default:
@ -995,14 +995,14 @@ PackageVersionComparsion PackageVersion::compare(const PackageVersion &other) co
if(!epoch.isEmpty() || !other.epoch.isEmpty()) {
switch(compareParts(other.epoch, epoch)) {
case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::SoftwareUpgrade;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion;
case PackageVersionPartComparsion::Equal: ;
}
}
// check whether upstream version differs
switch(compareParts(other.version, version)) {
case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::SoftwareUpgrade;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion;
case PackageVersionPartComparsion::Equal: ;
}
// check whether package version differs
@ -1010,7 +1010,7 @@ PackageVersionComparsion PackageVersion::compare(const PackageVersion &other) co
// only consider package release if both versions specify it (otherwise consider packages equal)
switch(compareParts(other.release, release)) {
case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::PackageUpgradeOnly;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion;
case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion;
case PackageVersionPartComparsion::Equal: ;
}
}

2
lib/alpm/package.h
View File

@ -25,7 +25,7 @@ enum class PackageVersionComparsion
Equal, /*!< The version of this package is the same as the version of the package from the sync db. */
SoftwareUpgrade, /*!< The software version of the package from the sync db is newer. */
PackageUpgradeOnly, /*!< The package release number of the package from the sync db is newer. */
NewerThenSyncVersion /*!< The version of this package is NEWER then the version of the package from the sync db. */
NewerThanSyncVersion /*!< The version of this package is NEWER than the version of the package from the sync db. */
};
/*!

2
lib/alpm/repository.cpp
View File

@ -403,7 +403,7 @@ void Repository::checkForUpgrades(UpgradeLookupResults &results, const QList<Rep
case PackageVersionComparsion::PackageUpgradeOnly:
results.newReleases << UpgradeResult(syncPkg, pkgEntry.second->version());
break;
case PackageVersionComparsion::NewerThenSyncVersion:
case PackageVersionComparsion::NewerThanSyncVersion:
results.downgrades << UpgradeResult(syncPkg, pkgEntry.second->version());
}
orphaned = false;