Attachment #1648 for bug #1707

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1707
Collapse All | Expand All




bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool samba) 
{  
  TQString nfsFileName = KNFSShare::instance()->exportsPath();
  bool nfsNeedsTDEsu = false;
  
  if (nfs) {
      if (TQFileInfo(nfsFileName).isWritable()) {
          nfsFile->saveTo(nfsFileName);
      } else {
          nfsNeedsTDEsu = true;
          kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs tdesu." << endl;
      }          
  } else


  
  TQString sambaFileName = KSambaShare::instance()->smbConfPath();
  bool sambaNeedsTDEsu = false;
  if (samba) {
      if (TQFileInfo(sambaFileName).isWritable()) {
          sambaFile->saveTo(sambaFileName);
      } else {
          sambaNeedsTDEsu = true;
          kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs tdesu." << endl;
      }          
  } else
    kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba has not changed." << endl;

  
  if (nfsNeedsTDEsu || sambaNeedsTDEsu) {
     KTempFile nfsTempFile;
     nfsTempFile.setAutoDelete(true);
     KTempFile sambaTempFile;


     TQString command;
     
     if (nfsNeedsTDEsu) {
         nfsFile->saveTo(nfsTempFile.name());
         command += TQString("cp %1 %2;exportfs -ra;")
        .arg(TDEProcess::quote( nfsTempFile.name() ))
        .arg(TDEProcess::quote( nfsFileName ));
     }         
     
     if (sambaNeedsTDEsu) {
         sambaFile->saveTo(sambaTempFile.name());
         command += TQString("cp %1 %2;")
        .arg(TDEProcess::quote( sambaTempFile.name() ))

Return to bug 1707

Lines 172-184 Link Here

(-)tdenetwork/filesharing/advanced/propsdlgplugin/propertiespage.cpp (-7 / +7 lines)
172	bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool samba)	172	bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool samba)
173	{	173	{
174	TQString nfsFileName = KNFSShare::instance()->exportsPath();	174	TQString nfsFileName = KNFSShare::instance()->exportsPath();
175	bool nfsNeedsKDEsu = false;	175	bool nfsNeedsTDEsu = false;
176		176
177	if (nfs) {	177	if (nfs) {
178	if (TQFileInfo(nfsFileName).isWritable()) {	178	if (TQFileInfo(nfsFileName).isWritable()) {
179	nfsFile->saveTo(nfsFileName);	179	nfsFile->saveTo(nfsFileName);
180	} else {	180	} else {
181	nfsNeedsKDEsu = true;	181	nfsNeedsTDEsu = true;
182	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs tdesu." << endl;	182	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs tdesu." << endl;
183	}	183	}
184	} else	184	} else
Lines 186-204 Link Here
186		186
187		187
188	TQString sambaFileName = KSambaShare::instance()->smbConfPath();	188	TQString sambaFileName = KSambaShare::instance()->smbConfPath();
189	bool sambaNeedsKDEsu = false;	189	bool sambaNeedsTDEsu = false;
190	if (samba) {	190	if (samba) {
191	if (TQFileInfo(sambaFileName).isWritable()) {	191	if (TQFileInfo(sambaFileName).isWritable()) {
192	sambaFile->saveTo(sambaFileName);	192	sambaFile->saveTo(sambaFileName);
193	} else {	193	} else {
194	sambaNeedsKDEsu = true;	194	sambaNeedsTDEsu = true;
195	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs tdesu." << endl;	195	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs tdesu." << endl;
196	}	196	}
197	} else	197	} else
198	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba has not changed." << endl;	198	kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba has not changed." << endl;
199		199
200		200
201	if (nfsNeedsKDEsu \|\| sambaNeedsKDEsu) {	201	if (nfsNeedsTDEsu \|\| sambaNeedsTDEsu) {
202	KTempFile nfsTempFile;	202	KTempFile nfsTempFile;
203	nfsTempFile.setAutoDelete(true);	203	nfsTempFile.setAutoDelete(true);
204	KTempFile sambaTempFile;	204	KTempFile sambaTempFile;
Lines 208-221 Link Here
208		208
209	TQString command;	209	TQString command;
210		210
211	if (nfsNeedsKDEsu) {	211	if (nfsNeedsTDEsu) {
212	nfsFile->saveTo(nfsTempFile.name());	212	nfsFile->saveTo(nfsTempFile.name());
213	command += TQString("cp %1 %2;exportfs -ra;")	213	command += TQString("cp %1 %2;exportfs -ra;")
214	.arg(TDEProcess::quote( nfsTempFile.name() ))	214	.arg(TDEProcess::quote( nfsTempFile.name() ))
215	.arg(TDEProcess::quote( nfsFileName ));	215	.arg(TDEProcess::quote( nfsFileName ));
216	}	216	}
217		217
218	if (sambaNeedsKDEsu) {	218	if (sambaNeedsTDEsu) {
219	sambaFile->saveTo(sambaTempFile.name());	219	sambaFile->saveTo(sambaTempFile.name());
220	command += TQString("cp %1 %2;")	220	command += TQString("cp %1 %2;")
221	.arg(TDEProcess::quote( sambaTempFile.name() ))	221	.arg(TDEProcess::quote( sambaTempFile.name() ))