Remove update index type dep, call update index after adding new source. (#623)
This commit is contained in:
		
					parent
					
						
							
								7fcfe8cff5
							
						
					
				
			
			
				commit
				
					
						eb94d7a8bb
					
				
			
		
					 3 changed files with 32 additions and 5 deletions
				
			
		
							
								
								
									
										28
									
								
								cdist/conf/type/__apt_source/gencode-remote
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										28
									
								
								cdist/conf/type/__apt_source/gencode-remote
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,28 @@ | ||||||
|  | #!/bin/sh -e | ||||||
|  | # | ||||||
|  | # 2018 Steven Armstrong (steven-cdist at armstrong.cc) | ||||||
|  | # | ||||||
|  | # This file is part of cdist. | ||||||
|  | # | ||||||
|  | # cdist is free software: you can redistribute it and/or modify | ||||||
|  | # it under the terms of the GNU General Public License as published by | ||||||
|  | # the Free Software Foundation, either version 3 of the License, or | ||||||
|  | # (at your option) any later version. | ||||||
|  | # | ||||||
|  | # cdist is distributed in the hope that it will be useful, | ||||||
|  | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||||
|  | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||||
|  | # GNU General Public License for more details. | ||||||
|  | # | ||||||
|  | # You should have received a copy of the GNU General Public License | ||||||
|  | # along with cdist. If not, see <http://www.gnu.org/licenses/>. | ||||||
|  | # | ||||||
|  | # | ||||||
|  | 
 | ||||||
|  | name="$__object_id" | ||||||
|  | destination="/etc/apt/sources.list.d/${name}.list" | ||||||
|  | 
 | ||||||
|  | if grep -q "^__file${destination}" "$__messages_in"; then | ||||||
|  |    printf 'apt-get update || apt-get update\n' | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | @ -8,7 +8,8 @@ cdist-type__apt_source - Manage apt sources | ||||||
| 
 | 
 | ||||||
| DESCRIPTION | DESCRIPTION | ||||||
| ----------- | ----------- | ||||||
| This cdist type allows you to manage apt sources. | This cdist type allows you to manage apt sources. It invokes index update | ||||||
|  | internally when needed so call of index updating type is not needed. | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| REQUIRED PARAMETERS | REQUIRED PARAMETERS | ||||||
|  | @ -63,7 +64,7 @@ Steven Armstrong <steven-cdist--@--armstrong.cc> | ||||||
| 
 | 
 | ||||||
| COPYING | COPYING | ||||||
| ------- | ------- | ||||||
| Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it | Copyright \(C) 2011-2018 Steven Armstrong. You can redistribute it | ||||||
| and/or modify it under the terms of the GNU General Public License as | and/or modify it under the terms of the GNU General Public License as | ||||||
| published by the Free Software Foundation, either version 3 of the | published by the Free Software Foundation, either version 3 of the | ||||||
| License, or (at your option) any later version. | License, or (at your option) any later version. | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| #!/bin/sh -e | #!/bin/sh -e | ||||||
| # | # | ||||||
| # 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc) | # 2011-2018 Steven Armstrong (steven-cdist at armstrong.cc) | ||||||
| # | # | ||||||
| # This file is part of cdist. | # This file is part of cdist. | ||||||
| # | # | ||||||
|  | @ -50,5 +50,3 @@ __file "/etc/apt/sources.list.d/${name}.list" \ | ||||||
|    --source "$__object/files/source.list" \ |    --source "$__object/files/source.list" \ | ||||||
|    --owner root --group root --mode 0644 \ |    --owner root --group root --mode 0644 \ | ||||||
|    --state "$state" |    --state "$state" | ||||||
| 
 |  | ||||||
| require="$__object_name" __apt_update_index |  | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue