Ignore:
Timestamp:
Dec 14, 2009, 8:59:28 PM (14 years ago)
Author:
broder
Message:

Rename the "git" tree in the configuration to "build" to be more accurate.

Location:
trunk/packages/invirt-dev
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/invirt-dev/invirt-build-conf

    r2584 r2593  
    3838    build_handler = '/usr/sbin/invirt-submit-build'
    3939
    40     for pocket in config.git.pockets:
    41         acl = authz.expandAdmin(getattr(config.git.pockets, pocket).acl, None)
     40    for pocket in config.build.pockets:
     41        acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None)
    4242
    4343        acl_fd, acl_name = tempfile.mkstemp()
  • trunk/packages/invirt-dev/invirtibuilder

    r2577 r2593  
    2121
    2222where pocket is one of the pockets globally configured in
    23 git.pockets. For instance, the pockets in XVM are "prod" and "dev".
     23build.pockets. For instance, the pockets in XVM are "prod" and "dev".
    2424
    2525principal is the Kerberos principal that requested the build.
     
    138138    legitimacy of my reasoning.
    139139    """
    140     if config.git.pockets[pocket].get('allow_backtracking', False):
     140    if config.build.pockets[pocket].get('allow_backtracking', False):
    141141        env = dict(os.environ)
    142142        branch = b.pocketToGit(pocket)
    143143        version = b.getVersion(package, ref)
    144144
    145         env['GIT_COMMITTER_NAME'] = config.git.tagger.name
    146         env['GIT_COMMITTER_EMAIL'] = config.git.tagger.email
     145        env['GIT_COMMITTER_NAME'] = config.build.tagger.name
     146        env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email
    147147        tag_msg = ('Tag %s of %s\n\n'
    148148                   'Requested by %s' % (version.full_version,
  • trunk/packages/invirt-dev/python/invirt/builder.py

    r2587 r2593  
    3232def pocketToGit(pocket):
    3333    """Map a pocket in the configuration to a git branch."""
    34     return getattr(getattr(config.git.pockets, pocket), 'git', pocket)
     34    return getattr(getattr(config.build.pockets, pocket), 'git', pocket)
    3535
    3636
    3737def pocketToApt(pocket):
    3838    """Map a pocket in the configuration to an apt repo pocket."""
    39     return getattr(getattr(config.git.pockets, pocket), 'apt', pocket)
     39    return getattr(getattr(config.build.pockets, pocket), 'apt', pocket)
    4040
    4141
     
    8989    new_version = getVersion(package, commit)
    9090
    91     for p in config.git.pockets:
     91    for p in config.build.pockets:
    9292        if p == pocket:
    9393            continue
     
    106106                                   (new_version, package, p, current_commit))
    107107
    108     if config.git.pockets[pocket].get('allow_backtracking', False):
     108    if config.build.pockets[pocket].get('allow_backtracking', False):
    109109        branch = pocketToGit(pocket)
    110110        current_version = getVersion(package, branch)
  • trunk/packages/invirt-dev/repository-config/distributions.mako

    r2552 r2593  
    33from invirt import builder as b
    44%>\
    5 % for pocket in cfg.git.pockets:
     5% for pocket in cfg.build.pockets:
    66CodeName: ${b.pocketToApt(pocket)}
    77Components: main invirt-system
Note: See TracChangeset for help on using the changeset viewer.