Changeset 2801 for trunk/packages
- Timestamp:
- Dec 28, 2009, 1:35:21 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/invirt-dev/invirtibuilder
r2593 r2801 8 8 If the build succeeds, the new version of the package is uploaded to 9 9 the apt repository, tagged in its git repository, and the Invirt 10 super repois updated to point at the new version.10 superproject is updated to point at the new version. 11 11 12 12 If the build fails, the Invirtibuilder sends mail with the build log. … … 174 174 175 175 176 def updateSuper repo(pocket, package, commit, principal):177 """Update the super repo.176 def updateSuperproject(pocket, package, commit, principal): 177 """Update the superproject. 178 178 179 179 This will create a new commit on the branch for the given pocket … … 181 181 182 182 Note that there's no locking issue here, because we disallow all 183 pushes to the super repo.184 """ 185 super repo= os.path.join(b._REPO_DIR, 'invirt/packages.git')183 pushes to the superproject. 184 """ 185 superproject = os.path.join(b._REPO_DIR, 'invirt/packages.git') 186 186 branch = b.pocketToGit(pocket) 187 187 tree = c.captureOutput(['git', 'ls-tree', branch], 188 cwd=super repo)188 cwd=superproject) 189 189 190 190 new_tree = re.compile( … … 194 194 195 195 new_tree_id = c.captureOutput(['git', 'mktree'], 196 cwd=super repo,196 cwd=superproject, 197 197 stdin_str=new_tree) 198 198 … … 203 203 new_commit = c.captureOutput( 204 204 ['git', 'commit-tree', new_tree_hash, '-p', branch], 205 cwd=super repo,205 cwd=superproject, 206 206 env=env, 207 207 stdin_str=commit_msg) … … 209 209 c.captureOutput( 210 210 ['git', 'update-ref', 'refs/heads/%s' % branch, new_commit], 211 cwd=super repo)211 cwd=superproject) 212 212 213 213 … … 330 330 db.failed_stage = 'updating submodule branches' 331 331 updateSubmoduleBranch(pocket, package, commit) 332 db.failed_stage = 'updating super repo'333 updateSuper repo(pocket, package, commit, principal)332 db.failed_stage = 'updating superproject' 333 updateSuperproject(pocket, package, commit, principal) 334 334 db.failed_stage = 'uploading packages to apt repo' 335 335 uploadBuild(pocket, workdir)
Note: See TracChangeset
for help on using the changeset viewer.