mirror of
				https://github.com/hauke68/Magallanes.git
				synced 2025-11-04 00:50:18 +01:00 
			
		
		
		
	Merge pull request #342 from thePanz/rsync-ignore-empty-excludes
Rsync task: ignore empty 'exclude' parameters
This commit is contained in:
		
						commit
						35e835f0c9
					
				@ -55,7 +55,7 @@ class RsyncTask extends AbstractTask
 | 
				
			|||||||
    protected function getExcludes()
 | 
					    protected function getExcludes()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $excludes = $this->runtime->getEnvOption('exclude', []);
 | 
					        $excludes = $this->runtime->getEnvOption('exclude', []);
 | 
				
			||||||
        $excludes = array_merge(['.git'], $excludes);
 | 
					        $excludes = array_merge(['.git'], array_filter($excludes));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        foreach ($excludes as &$exclude) {
 | 
					        foreach ($excludes as &$exclude) {
 | 
				
			||||||
            $exclude = '--exclude=' . $exclude;
 | 
					            $exclude = '--exclude=' . $exclude;
 | 
				
			||||||
 | 
				
			|||||||
@ -52,7 +52,7 @@ class PrepareTask extends AbstractTask
 | 
				
			|||||||
    protected function getExcludes()
 | 
					    protected function getExcludes()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $excludes = $this->runtime->getEnvOption('exclude', []);
 | 
					        $excludes = $this->runtime->getEnvOption('exclude', []);
 | 
				
			||||||
        $excludes = array_merge(['.git'], $excludes);
 | 
					        $excludes = array_merge(['.git'], array_filter($excludes));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        foreach ($excludes as &$exclude) {
 | 
					        foreach ($excludes as &$exclude) {
 | 
				
			||||||
            $exclude = '--exclude="' . $exclude . '"';
 | 
					            $exclude = '--exclude="' . $exclude . '"';
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user