Compare commits
	
		
			2 Commits
		
	
	
		
			f346390631
			...
			8968667c23
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8968667c23 | |||
| a5e0154757 | 
@@ -105,7 +105,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			|||||||
#           checking of the ISMAS-trigger-button (aka WAIT-button).
 | 
					#           checking of the ISMAS-trigger-button (aka WAIT-button).
 | 
				
			||||||
# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
 | 
					# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
 | 
				
			||||||
#           first step
 | 
					#           first step
 | 
				
			||||||
VERSION="1.4.1"
 | 
					# 1.4.2   : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
 | 
				
			||||||
 | 
					#           the same after an rsync. They might be noy after a change of the
 | 
				
			||||||
 | 
					#           customer-number.
 | 
				
			||||||
 | 
					VERSION="1.4.2"
 | 
				
			||||||
# PLANNED TODOS:
 | 
					# PLANNED TODOS:
 | 
				
			||||||
#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
					#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
				
			||||||
#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
					#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -991,10 +991,12 @@ bool Worker::syncCustomerRepositoryAndFS() {
 | 
				
			|||||||
                QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
 | 
					                QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
 | 
				
			||||||
                QDir dir2("/etc/psa_tariff");
 | 
					                QDir dir2("/etc/psa_tariff");
 | 
				
			||||||
                if (Utils::sameFilesInDirs(dir1, dir2)) {
 | 
					                if (Utils::sameFilesInDirs(dir1, dir2)) {
 | 
				
			||||||
                    CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
 | 
					                    CONSOLE() <<  QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
 | 
				
			||||||
                    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 | 
					                              << "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
 | 
				
			||||||
                    return true;
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					                CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS;
 | 
				
			||||||
 | 
					                setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 | 
				
			||||||
 | 
					                return true;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user