|
Line
Link Here
|
| 0 |
-- src/portage/conf/portagesettings.cc |
0 |
++ src/portage/conf/portagesettings.cc |
|
Lines 42-48
Link Here
|
| 42 |
|
42 |
|
| 43 |
using namespace std; |
43 |
using namespace std; |
| 44 |
|
44 |
|
| 45 |
bool grab_masks(const char *file, Mask::Type type, MaskList<Mask> *cat_map, vector<Mask*> *mask_vec) |
45 |
bool grab_masks_file(const char *file, Mask::Type type, MaskList<Mask> *cat_map, vector<Mask*> *mask_vec) |
| 46 |
{ |
46 |
{ |
| 47 |
ifstream mask_file(file); |
47 |
ifstream mask_file(file); |
| 48 |
if(mask_file.is_open()) { |
48 |
if(mask_file.is_open()) { |
|
Lines 72-77
Link Here
|
| 72 |
return false; |
72 |
return false; |
| 73 |
} |
73 |
} |
| 74 |
|
74 |
|
|
|
75 |
bool grab_masks(const char *file_dir, Mask::Type type, MaskList<Mask> *cat_map, vector<Mask*> *mask_vec) |
| 76 |
{ |
| 77 |
static const char *files_exclude[] = { "..", "." , NULL }; |
| 78 |
vector<string> files; |
| 79 |
string dir(file_dir); |
| 80 |
dir += "/"; |
| 81 |
if(pushback_files(dir, files, files_exclude)) |
| 82 |
{ |
| 83 |
bool rvalue=true; |
| 84 |
for(vector<string>::iterator it=files.begin(); |
| 85 |
it<files.end(); ++it) |
| 86 |
{ |
| 87 |
if(! grab_masks_file(it->c_str(), type, cat_map, mask_vec)) |
| 88 |
rvalue=false; |
| 89 |
} |
| 90 |
return rvalue; |
| 91 |
} |
| 92 |
else |
| 93 |
return grab_masks_file(file_dir, type, cat_map, mask_vec); |
| 94 |
} |
| 95 |
|
| 96 |
|
| 97 |
|
| 75 |
/** Key that should accumelate their content rathern then replace. */ |
98 |
/** Key that should accumelate their content rathern then replace. */ |
| 76 |
static const char *default_accumulating_keys[] = { |
99 |
static const char *default_accumulating_keys[] = { |
| 77 |
"USE", |
100 |
"USE", |
