forked from ungleich-public/cdist
		
	Fix removing archive. Push new branch if builder not Nico.
This commit is contained in:
		
					parent
					
						
							
								9256aa8d58
							
						
					
				
			
			
				commit
				
					
						ec425be624
					
				
			
		
					 2 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
					@ -225,7 +225,7 @@ eof
 | 
				
			||||||
            || exit 1
 | 
					            || exit 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # remove generated files (archive and asc)
 | 
					        # remove generated files (archive and asc)
 | 
				
			||||||
        if [ $# -ge 2]
 | 
					        if [ $# -eq 2]
 | 
				
			||||||
        then
 | 
					        then
 | 
				
			||||||
            rm -f "${archivename}"
 | 
					            rm -f "${archivename}"
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -260,7 +260,7 @@ eof
 | 
				
			||||||
            || exit 1
 | 
					            || exit 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # remove generated files (archive and asc)
 | 
					        # remove generated files (archive and asc)
 | 
				
			||||||
        if [ $# -ge 2]
 | 
					        if [ $# -eq 2]
 | 
				
			||||||
        then
 | 
					        then
 | 
				
			||||||
            rm -f "${archivename}"
 | 
					            rm -f "${archivename}"
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
| 
						 | 
					@ -346,6 +346,8 @@ eof
 | 
				
			||||||
            freebsd)
 | 
					            freebsd)
 | 
				
			||||||
                # if we are not Nico :) then just push, no mirror
 | 
					                # if we are not Nico :) then just push, no mirror
 | 
				
			||||||
                git push
 | 
					                git push
 | 
				
			||||||
 | 
					                # push also new branch and set up tracking
 | 
				
			||||||
 | 
					                git push -u origin "${target_branch}"
 | 
				
			||||||
            ;;
 | 
					            ;;
 | 
				
			||||||
            *)
 | 
					            *)
 | 
				
			||||||
                make helper=${helper} WEBDIR=${WEBDIR} pub
 | 
					                make helper=${helper} WEBDIR=${WEBDIR} pub
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue