Revision 6b88d711
| b/devflow/autopkg.py | ||
|---|---|---|
| 186 | 186 |
" one of %s" % (branch, allowed_branches)) |
| 187 | 187 |
|
| 188 | 188 |
# Fix needed environment variables |
| 189 |
v = utils.get_vcs_info() |
|
| 189 | 190 |
os.environ["DEVFLOW_BUILD_MODE"] = mode |
| 190 |
git_config = original_repo.config_reader() |
|
| 191 |
try: |
|
| 192 |
os.environ["DEBFULLNAME"] = git_config.get_value("user", "name")
|
|
| 193 |
os.environ["DEBEMAIL"] = git_config.get_value("user", "email")
|
|
| 194 |
except: |
|
| 195 |
print "Could not load user/email from config" |
|
| 191 |
os.environ["DEBFULLNAME"] = v.name |
|
| 192 |
os.environ["DEBEMAIL"] = v.email |
|
| 196 | 193 |
|
| 197 | 194 |
# Check that base version file and branch are correct |
| 198 | 195 |
versioning.get_python_version() |
| b/devflow/utils.py | ||
|---|---|---|
| 80 | 80 |
revid = get_commit_id(branch.commit, branch) |
| 81 | 81 |
revno = len(list(repo.iter_commits())) |
| 82 | 82 |
toplevel = repo.working_dir |
| 83 |
config = repo.config_reader() |
|
| 84 |
name = config.get_value("user", "name")
|
|
| 85 |
email = config.get_value("user", "email")
|
|
| 83 | 86 |
|
| 84 | 87 |
info = namedtuple("vcs_info", ["branch", "revid", "revno",
|
| 85 |
"toplevel"]) |
|
| 88 |
"toplevel", "name", "email"])
|
|
| 86 | 89 |
|
| 87 | 90 |
return info(branch=branch.name, revid=revid, revno=revno, |
| 88 |
toplevel=toplevel) |
|
| 91 |
toplevel=toplevel, name=name, email=email)
|
|
| 89 | 92 |
|
| 90 | 93 |
|
| 91 | 94 |
def get_commit_id(commit, current_branch): |
| b/devflow/versioning.py | ||
|---|---|---|
| 44 | 44 |
import os |
| 45 | 45 |
import re |
| 46 | 46 |
import sys |
| 47 |
import pprint |
|
| 48 | 47 |
|
| 49 | 48 |
from distutils import log # pylint: disable=E0611 |
| 50 | 49 |
|
| ... | ... | |
| 336 | 335 |
return debian_version(b, v, mode) |
| 337 | 336 |
|
| 338 | 337 |
|
| 339 |
def user_info(): |
|
| 340 |
import getpass |
|
| 341 |
import socket |
|
| 342 |
return "%s@%s" % (getpass.getuser(), socket.getfqdn()) |
|
| 343 |
|
|
| 344 |
|
|
| 345 | 338 |
def update_version(): |
| 346 | 339 |
"""Generate or replace version files |
| 347 | 340 |
|
| ... | ... | |
| 361 | 354 |
b = get_base_version(v) |
| 362 | 355 |
mode = utils.get_build_mode() |
| 363 | 356 |
version = python_version(b, v, mode) |
| 364 |
vcs_info_dict = dict(v._asdict()) # pylint: disable=W0212 |
|
| 365 | 357 |
vcs_info = """{
|
| 366 | 358 |
'branch': '%s', |
| 367 | 359 |
'revid': '%s', |
| ... | ... | |
| 370 | 362 |
"""__version__ = "%(version)s" |
| 371 | 363 |
__version_info__ = %(version_info)s |
| 372 | 364 |
__version_vcs_info__ = %(vcs_info)s |
| 373 |
__version_user_info__ = "%(user_info)s" |
|
| 365 |
__version_user_email__ = "%(user_email)s" |
|
| 366 |
__version_user_name__ = "%(user_name)s" |
|
| 374 | 367 |
""" % dict(version=version, version_info=version.split("."),
|
| 375 | 368 |
vcs_info=vcs_info, |
| 376 |
user_info=user_info()) |
|
| 369 |
user_email=v.email, |
|
| 370 |
user_name=v.name) |
|
| 377 | 371 |
|
| 378 | 372 |
for _pkg_name, pkg_info in config['packages'].items(): |
| 379 | 373 |
version_filename = pkg_info['version_file'] |
Also available in: Unified diff