mirror of
				https://git.launchpad.net/ubuntu-dev-tools
				synced 2025-11-04 07:54:03 +00:00 
			
		
		
		
	backportpackage: Wrap source to 80-column lines
This commit is contained in:
		
							parent
							
								
									1a2677b8ef
								
							
						
					
					
						commit
						3ab323805e
					
				@ -50,12 +50,12 @@ def parse(args):
 | 
			
		||||
    p.add_option('-f', '--from',
 | 
			
		||||
                 dest='source_release',
 | 
			
		||||
                 default=None,
 | 
			
		||||
                 help='Backport from SOURCE release (defaults to devel release)',
 | 
			
		||||
                 help='Backport from SOURCE release (default: devel release)',
 | 
			
		||||
                 metavar='SOURCE')
 | 
			
		||||
    p.add_option('-v', '--version',
 | 
			
		||||
                 dest='version',
 | 
			
		||||
                 default=None,
 | 
			
		||||
                 help='Package version to backport (verified if source release also specified)',
 | 
			
		||||
                 help='Package version to backport (or verify)',
 | 
			
		||||
                 metavar='VERSION')
 | 
			
		||||
    p.add_option('-s', '--source',
 | 
			
		||||
                 dest='package',
 | 
			
		||||
@ -68,7 +68,7 @@ def parse(args):
 | 
			
		||||
    p.add_option('-l', '--launchpad',
 | 
			
		||||
                 dest='launchpad',
 | 
			
		||||
                 default='production',
 | 
			
		||||
                 help='Launchpad instance to connect to (default %default)',
 | 
			
		||||
                 help='Launchpad instance to connect to (default: %default)',
 | 
			
		||||
                 metavar='INSTANCE')
 | 
			
		||||
 | 
			
		||||
    opts, args = p.parse_args(args)
 | 
			
		||||
@ -99,11 +99,12 @@ def find_release_package(workdir, opts):
 | 
			
		||||
        except IndexError:
 | 
			
		||||
            continue
 | 
			
		||||
    else:
 | 
			
		||||
        error('Unable to find package %s in release %s' % (package, opts.source_release))
 | 
			
		||||
        error('Unable to find package %s in release %s' %
 | 
			
		||||
              (package, opts.source_release))
 | 
			
		||||
 | 
			
		||||
    if opts.version and opts.version != srcpkg.source_package_version:
 | 
			
		||||
        error('Requested backport of version %s but %s in %s is at version %s' %
 | 
			
		||||
              (opts.version, opts.package, opts.source_release, srcpkg.source_package_version))
 | 
			
		||||
        error('Requested backport of version %s but %s is at version %s' %
 | 
			
		||||
              (opts.version, opts.package, srcpkg.source_package_version))
 | 
			
		||||
 | 
			
		||||
    return srcpkg
 | 
			
		||||
 | 
			
		||||
@ -195,12 +196,14 @@ def main(args):
 | 
			
		||||
                bp_version = bp_version[bp_version.find(':')+1:]
 | 
			
		||||
 | 
			
		||||
            print 'Please check the package in file://%s carefully' % tmpdir
 | 
			
		||||
            prompt = 'Do you still want to upload this to %s? [Y/n]' % upload
 | 
			
		||||
            while True:
 | 
			
		||||
                answer = raw_input('Do you still want to upload this to %s? [Y/n] ' % upload).strip().lower()
 | 
			
		||||
                answer = raw_input(prompt).strip().lower()
 | 
			
		||||
                if answer in ('', 'y', 'yes'):
 | 
			
		||||
                    check_call(['dput',
 | 
			
		||||
                                upload,
 | 
			
		||||
                                '%s_%s_source.changes' % (package, bp_version)],
 | 
			
		||||
                                '%s_%s_source.changes' %
 | 
			
		||||
                                (package, bp_version)],
 | 
			
		||||
                               cwd=tmpdir)
 | 
			
		||||
 | 
			
		||||
                    break
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user