Author: shadowmaster
Date: Mon Aug 11 21:31:16 2008
New Revision: 28471

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28471&view=rev
Log:
* Ditch prepending of default ignore patterns; back to former behavior

Modified:
    trunk/src/addon_management.cpp

Modified: trunk/src/addon_management.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_management.cpp?rev=28471&r1=28470&r2=28471&view=diff
==============================================================================
--- trunk/src/addon_management.cpp (original)
+++ trunk/src/addon_management.cpp Mon Aug 11 21:31:16 2008
@@ -234,15 +234,15 @@
 
        std::pair<std::vector<std::string>, std::vector<std::string> > patterns;
        std::string ign_file;
-       LOG_CFG << "inserting default ignore patterns...\n";
-       append_default_ignore_patterns(patterns);
        LOG_CFG << "searching for .ign file for '" << addon_name << "'...\n";
        if (file_exists(interior)) {
                ign_file = interior;
        } else if (file_exists(exterior)) {
                ign_file = exterior;
        } else {
-               LOG_CFG << "no .ign file found for '" << addon_name << "'\n";
+               LOG_CFG << "no .ign file found for '" << addon_name << "'\n"
+                       << "inserting default ignore patterns...\n";
+               append_default_ignore_patterns(patterns);
                return patterns; // just default patterns
        }
        LOG_CFG << "found .ign file: " << ign_file << '\n';


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to