Changeset 3045


Ignore:
Timestamp:
Jul 6, 2010, 12:28:35 AM (9 years ago)
Author:
gdb
Message:

Don't forget to do tagging before an aptCopy

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/invirt-dev/invirtibuilder

    r3044 r3045  
    290290            db.commit = commit = b.canonicalize_commit(package, commit)
    291291            src = b.validateBuild(pocket, package, commit)
    292 
    293             db.version = str(b.getVersion(package, commit))
     292            version = b.getVersion(package, commit)
     293            db.version = str(version)
    294294            b.runHook('pre-build', [str(db.build_id), db.pocket, db.package,
    295295                                    db.commit, db.principal, db.version, str(db.inserted_at)])
     296
     297            env = dict(os.environ)
     298            env['GIT_COMMITTER_NAME'] = config.build.tagger.name
     299            env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email
    296300
    297301            # If validateBuild returns something other than True, then
     
    301305            # raised an exception)
    302306            if src != True:
     307                # TODO: cut out this code duplication
     308                db.failed_stage = 'tagging submodule before copying package'
     309                tagSubmodule(pocket, package, commit, principal, version, env)
     310                db.failed_stage = 'updating submodule branches before copying package'
     311                updateSubmoduleBranch(pocket, package, commit)
     312                db.failed_stage = 'updating superproject before copying package'
     313                updateSuperproject(pocket, package, commit, principal, version, env)
    303314                db.failed_stage = 'copying package from another pocket'
    304315                aptCopy(package, commit, pocket, src)
     316               
    305317            # If we can't copy the package from somewhere, but
    306318            # validateBuild didn't raise an exception, then we need to
     
    334346                            os.copy(log, logdir)
    335347
    336                     db.failed_stage = 'processing metadata'
    337                     env = dict(os.environ)
    338                     env['GIT_COMMITTER_NAME'] = config.build.tagger.name
    339                     env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email
    340                     version = b.getVersion(package, commit)
    341 
    342348                    db.failed_stage = 'tagging submodule'
    343                     tagSubmodule(pocket, package, principal, version, env)
     349                    tagSubmodule(pocket, package, commit, principal, version, env)
    344350                    db.failed_stage = 'updating submodule branches'
    345351                    updateSubmoduleBranch(pocket, package, commit)
Note: See TracChangeset for help on using the changeset viewer.