mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-03 22:20:28 +03:00 
			
		
		
		
	scanner: support workspace for lock files
This commit is contained in:
		
							parent
							
								
									f337ef95a9
								
							
						
					
					
						commit
						9482ddfbe3
					
				
					 10 changed files with 9 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -816,9 +816,15 @@ def scan_source(build_dir, build=metadata.Build(), json_per_build=None):
 | 
			
		|||
                    )
 | 
			
		||||
 | 
			
		||||
            elif curfile in DEPFILE:
 | 
			
		||||
                for lockfile in DEPFILE[curfile]:
 | 
			
		||||
                    if os.path.isfile(os.path.join(root, lockfile)):
 | 
			
		||||
                        break
 | 
			
		||||
                d = root
 | 
			
		||||
                while d.startswith(build_dir):
 | 
			
		||||
                    for lockfile in DEPFILE[curfile]:
 | 
			
		||||
                        if os.path.isfile(os.path.join(d, lockfile)):
 | 
			
		||||
                            break
 | 
			
		||||
                    else:
 | 
			
		||||
                        d = os.path.dirname(d)
 | 
			
		||||
                        continue
 | 
			
		||||
                    break
 | 
			
		||||
                else:
 | 
			
		||||
                    count += handleproblem(
 | 
			
		||||
                        _('dependency file without lock'),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir/Cargo.lock
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir/Cargo.lock
									
										
									
										generated
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue