diff --git a/bdisk/host.py b/bdisk/host.py index 174010b..6a5ca70 100755 --- a/bdisk/host.py +++ b/bdisk/host.py @@ -79,6 +79,8 @@ def parseConfig(confs): config_dict['sync']['tftp'] = config['sync'].getboolean('tftp') config_dict['rsync']['iso'] = config['rsync'].getboolean('iso') # Get the version... + # Three possibilities. + # e.g. 1 commit after tag with short hash: ['v3.10', '1', 'gb4a5e40'] if config_dict['bdisk']['ver'] == '': repo = git.Repo(config_dict['build']['basedir']) refs = repo.git.describe(repo.head.commit).split('-') diff --git a/bdisk/ipxe.py b/bdisk/ipxe.py index 833f284..59e73c5 100755 --- a/bdisk/ipxe.py +++ b/bdisk/ipxe.py @@ -27,7 +27,7 @@ def buildIPXE(conf): ipxe_usb = '{0}-{1}-{2}.usb.img'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) ipxe_mini = '{0}-{1}-{2}.mini.iso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) ipxe_emini = '{0}-{1}-{2}.mini.eiso'.format(bdisk['uxname'], bdisk['ver'], build['buildnum']) - usb_file = '{0}/{1}'.format(img_path, ipxe_usb) + usb_file = '{0}{1}'.format(img_path, ipxe_usb) emini_file = '{0}{1}'.format(img_path, ipxe_emini) mini_file = '{0}{1}'.format(img_path, ipxe_mini) ipxe_git_uri = 'git://git.ipxe.org/ipxe.git' @@ -126,7 +126,7 @@ def buildIPXE(conf): DEVNULL = open(os.devnull, 'w') if os.path.isfile(build['dlpath'] + '/ipxe.log'): os.remove(build['dlpath'] + '/ipxe.log') - print(('{0}: [IPXE] Building iPXE ({1})... PROGRESS: tail -f {2}/ipxe.log ...').format( + print(('{0}: [IPXE] Building iPXE ({1}). PROGRESS: tail -f {2}/ipxe.log ...').format( datetime.datetime.now(), ipxe_src, build['dlpath']))