Attachment #78768 for bug #121360

View | Details | Raw Unified | Return to bug 121360
Collapse All | Expand All




	if (remove)
	{
		ml->remove(m);
		delete m;
	}
	else 
	{


void CascadingProfile::readPackageMasks(const string &line)
{
	if(line[0] == '-')
	{
		Mask *m = new Mask(line.substr(1).c_str(), Mask::maskMask);
		m_package_masks.remove(m);
		delete m;
	}
	else
	{
		m_package_masks.add(new Mask(line.c_str(), Mask::maskMask));
	}
}

/** Cycle through profile and put path to files into this->m_profile_files. */

Return to bug 121360

Lines 141-146 Link Here

(-)src/portage/conf/cascadingprofile.cc (-1 / +11 lines)
141	if (remove)	141	if (remove)
142	{	142	{
143	ml->remove(m);	143	ml->remove(m);
		144	delete m;
144	}	145	}
145	else	146	else
146	{	147	{
Lines 172-178 Link Here
172		173
173	void CascadingProfile::readPackageMasks(const string &line)	174	void CascadingProfile::readPackageMasks(const string &line)
174	{	175	{
175	m_package_masks.add(new Mask(line.c_str(), Mask::maskMask));	176	if(line[0] == '-')
		177	{
		178	Mask *m = new Mask(line.substr(1).c_str(), Mask::maskMask);
		179	m_package_masks.remove(m);
		180	delete m;
		181	}
		182	else
		183	{
		184	m_package_masks.add(new Mask(line.c_str(), Mask::maskMask));
		185	}
176	}	186	}
177		187
178	/** Cycle through profile and put path to files into this->m_profile_files. */	188	/** Cycle through profile and put path to files into this->m_profile_files. */