summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-09-12 22:41:31 +0000
committerMarc Laukien <marc@zeroc.com>2002-09-12 22:41:31 +0000
commit267b8143b2b951428a85939da5a69aa157eee0c1 (patch)
tree370cda4dea7ef67db10a99e7c2408f6fbdbebdae /cpp/src
parentFixed the IceSSL project. (diff)
downloadice-267b8143b2b951428a85939da5a69aa157eee0c1.tar.bz2
ice-267b8143b2b951428a85939da5a69aa157eee0c1.tar.xz
ice-267b8143b2b951428a85939da5a69aa157eee0c1.zip
fixes
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IcePatch/Client.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index 19a32bd8a30..518ea1c0bd7 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -402,7 +402,6 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
{
orphaned.erase(path);
orphaned.erase(path + ".md5");
- orphaned.erase(path + ".bz2");
}
bool last = (i == fileDescSeq.size() - 1) && orphaned.empty();
@@ -483,6 +482,7 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
{
case FileTypeNotExist:
{
+ orphaned.erase(path + ".bz2");
getRegular(regDesc->reg, progressCB);
break;
}
@@ -490,6 +490,7 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
case FileTypeDirectory:
{
removeRecursive(path);
+ orphaned.erase(path + ".bz2");
getRegular(regDesc->reg, progressCB);
break;
}
@@ -508,6 +509,7 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
if(md5 != regDesc->md5)
{
removeRecursive(path);
+ orphaned.erase(path + ".bz2");
getRegular(regDesc->reg, progressCB);
}
else