amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 21:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

PACKAGE_INSTALL now stands for both installation and upgrades

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@795 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-12-29 20:46:00 +00:00
parent eba28b64d3
commit eed8ba4274
9 changed files with 83 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/package.cpp
+4 -1
View File
@@ -541,7 +541,10 @@ void Packaged::saveAs(const String& package, bool remove_unused) {
void Packaged::validate(Version) {
// a default for the short name
if (short_name.empty()) short_name = name();
if (short_name.empty()) {
if (!full_name.empty()) short_name = full_name;
short_name = name();
}
// check dependencies
FOR_EACH(dep, dependencies) {
packages.checkDependency(*dep, true);
src/util/io/package_manager.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ bool PackageDirectory::install(const InstallablePackage& package) {
String n = name(package.description->name);
if (package.action & PACKAGE_REMOVE) {
remove_file_or_dir(n);
} else if ((package.action & PACKAGE_UPGRADE) || (package.action & PACKAGE_INSTALL)) {
} else if (package.action & PACKAGE_INSTALL) {
remove_file_or_dir(n + _(".new"));
bool ok = actual_install(package, n + _(".new"));
if (!ok) return false;