Attachment #5205 for bug #26429

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




               S += "[" + (*it)->VendorID + "] ";

            S += (*it)->URI + " ";
            S += (*it)->Dist;

            for (unsigned int J = 0; J < (*it)->NumSections; J++)
               S += " " + (*it)->Sections[J];
         }
         if ( ! S.empty() ) // we needn't to write empty line ...
	     ofs << S << endl;
      }
      ofs.close();
   }

{
   Configuration Cnf;

   string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
   if (FileExists(CnfFile) == true)
      if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
   CnfFile = _config->FindFile("Dir::Etc::vendorlist");
   if (FileExists(CnfFile) == true)
      if (ReadConfigFile(Cnf, CnfFile, true) == false)
         return false;

Lines 674-684 void RGRepositoryEditor::SelectionChanged(GtkTreeSelection *selection, Link Here

(-)a/synaptic/gtk/rgrepositorywin.cc (-5 / +9 lines)
674	gtk_entry_set_text(GTK_ENTRY(me->_entryURI), utf8(rec->URI.c_str()));	674	gtk_entry_set_text(GTK_ENTRY(me->_entryURI), utf8(rec->URI.c_str()));
675	gtk_entry_set_text(GTK_ENTRY(me->_entryDist), utf8(rec->Dist.c_str()));	675	gtk_entry_set_text(GTK_ENTRY(me->_entryDist), utf8(rec->Dist.c_str()));
676	gtk_entry_set_text(GTK_ENTRY(me->_entrySect), "");	676	gtk_entry_set_text(GTK_ENTRY(me->_entrySect), "");
677		677
678	for (unsigned int I = 0; I < rec->NumSections; I++) {	678	if (rec->NumSections > 0) { // if (... == 0) do nothing ...
679	gtk_entry_append_text(GTK_ENTRY(me->_entrySect),	679	for (unsigned int I = 0; I < (rec->NumSections - 1); I++) {
680	utf8(rec->Sections[I].c_str()));	680	gtk_entry_append_text(GTK_ENTRY(me->_entrySect),
681	gtk_entry_append_text(GTK_ENTRY(me->_entrySect), " ");	681	utf8(rec->Sections[I].c_str()));
		682	gtk_entry_append_text(GTK_ENTRY(me->_entrySect), " ");
		683	}
		684	gtk_entry_append_text(GTK_ENTRY(me->_entrySect),
		685	utf8(rec->Sections[rec->NumSections - 1].c_str()));
682	}	686	}
683	} else {	687	} else {
684	//cout << "no selection" << endl;	688	//cout << "no selection" << endl;

Return to bug 26429

Lines 326-337 bool SourcesList::UpdateSources() Link Here

(-)a/synaptic/common/rsources.cc (-4 / +9 lines)
326	S += "[" + (*it)->VendorID + "] ";	326	S += "[" + (*it)->VendorID + "] ";
327		327
328	S += (*it)->URI + " ";	328	S += (*it)->URI + " ";
329	S += (*it)->Dist + " ";	329	S += (*it)->Dist;
330		330
331	for (unsigned int J = 0; J < (*it)->NumSections; J++)	331	for (unsigned int J = 0; J < (*it)->NumSections; J++)
332	S += (*it)->Sections[J] + " ";	332	S += " " + (*it)->Sections[J];
333	}	333	}
334	ofs << S << endl;	334	if ( ! S.empty() ) // we needn't to write empty line ...
		335	ofs << S << endl;
335	}	336	}
336	ofs.close();	337	ofs.close();
337	}	338	}
Lines 433-439 bool SourcesList::ReadVendors() Link Here
433	{	434	{
434	Configuration Cnf;	435	Configuration Cnf;
435		436
436	string CnfFile = _config->FindFile("Dir::Etc::vendorlist");	437	string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
		438	if (FileExists(CnfFile) == true)
		439	if (ReadConfigDir(Cnf,CnfFile,true) == false)
		440	return false;
		441	CnfFile = _config->FindFile("Dir::Etc::vendorlist");
437	if (FileExists(CnfFile) == true)	442	if (FileExists(CnfFile) == true)
438	if (ReadConfigFile(Cnf, CnfFile, true) == false)	443	if (ReadConfigFile(Cnf, CnfFile, true) == false)
439	return false;	444	return false;