From e5b84a402ba216ffefa8fb85a802828e3895b2f7 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 16 Sep 2003 04:59:31 +0000 Subject: [PATCH] Actually ignore CVS directories now. Plus, fix the incorrect error message when installing. --- stepmania/PBProject/Installer/Processor.cpp | 16 ++++++++-------- stepmania/PBProject/Installer/Util.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/PBProject/Installer/Processor.cpp b/stepmania/PBProject/Installer/Processor.cpp index 79fc083e6d..ada1d7849b 100644 --- a/stepmania/PBProject/Installer/Processor.cpp +++ b/stepmania/PBProject/Installer/Processor.cpp @@ -169,16 +169,16 @@ void Processor::ProcessLine(const CString& line, unsigned& nextLine) return; } +#pragma mark IGNORE + if (parts[0] == "IGNORE") + { + if (parts.size() != 2) + goto error; + mIgnore.insert(ResolveVar(parts[1])); + } + if (!mInstalling) { -#pragma mark IGNORE - if (parts[0] == "IGNORE") - { - if (parts.size() != 2) - goto error; - mIgnore.insert(ResolveVar(parts[1])); - } - ++nextLine; return; } diff --git a/stepmania/PBProject/Installer/Util.cpp b/stepmania/PBProject/Installer/Util.cpp index 93d73fdd01..a3cecd8778 100644 --- a/stepmania/PBProject/Installer/Util.cpp +++ b/stepmania/PBProject/Installer/Util.cpp @@ -50,7 +50,7 @@ inline CString LastPathComponent(const CString& path) if (pos == path.npos) pos = 0; - return path.substr(pos); + return path.substr(pos+1); } void FileListingForDirectoryWithIgnore(const CString& path, CStringArray& list, CStringArray& dirs,