After "rsync", compare etc/psa_tariff and /etc/psa_tariff, if they contain the
same traiff-files (as they should).
This commit is contained in:
		
							
								
								
									
										13
									
								
								worker.cpp
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								worker.cpp
									
									
									
									
									
								
							@@ -1001,9 +1001,16 @@ bool Worker::syncCustomerRepositoryAndFS() {
 | 
			
		||||
            progress += 5;
 | 
			
		||||
            setProgress(progress);
 | 
			
		||||
            if (!error) {
 | 
			
		||||
                setProgress(100);
 | 
			
		||||
                emit replaceLast(QString("Sync customer environment with filesystem ..."), UPDATE_STEP_DONE);
 | 
			
		||||
                return true;
 | 
			
		||||
                // now check tariff-files in etc and /etc/psa_tariff
 | 
			
		||||
                QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
 | 
			
		||||
                QDir dir2("/etc/psa_tariff");
 | 
			
		||||
                if (Utils::sameFilesInDirs(dir1, dir2)) {
 | 
			
		||||
                    setProgress(100);
 | 
			
		||||
                    emit replaceLast(QString("Sync customer environment with filesystem ..."), UPDATE_STEP_DONE);
 | 
			
		||||
                    return true;
 | 
			
		||||
                } else {
 | 
			
		||||
                    // TODO: send message to ISMAS
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user