Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for building with local packages on Debian and Ubuntu #34172

Merged
merged 2 commits into from
Jun 22, 2016
Merged

Support for building with local packages on Debian and Ubuntu #34172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82fa276
Support for building with local packages on Debian and Ubuntu
dmurphy18 Jun 21, 2016
f7f8a5d
Fixed pylint issues
dmurphy18 Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions salt/modules/debbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,6 @@ def make_src_pkg(dest_dir, spec, sources, env=None, template=None, saltenv='base
shutil.copy(full, trgt)
ret.append(trgt)

trgt = os.path.join(dest_dir, os.path.basename(spec_pathfile))
shutil.copy(spec_pathfile, trgt)
ret.append(trgt)

return ret

# obtain name of 'python setup.py sdist' generated tarball, extract the version
Expand Down Expand Up @@ -406,6 +402,12 @@ def build(runas,
log.error('Failed to make src package')
return ret

cmd = 'pbuilder --create'
__salt__['cmd.run'](cmd, runas=runas, python_shell=True)

# use default /var/cache/pbuilder/result
results_dir = '/var/cache/pbuilder/result'

# dscs should only contain salt orig and debian tarballs and dsc file
for dsc in dscs:
afile = os.path.basename(dsc)
Expand All @@ -414,26 +416,31 @@ def build(runas,

if dsc.endswith('.dsc'):
dbase = os.path.dirname(dsc)
results_dir = tempfile.mkdtemp()
try:
__salt__['cmd.run']('chown {0} -R {1}'.format(runas, dbase))
__salt__['cmd.run']('chown {0} -R {1}'.format(runas, results_dir))

cmd = 'pbuilder --create'
cmd = 'pbuilder --update --override-config'
__salt__['cmd.run'](cmd, runas=runas, python_shell=True)
cmd = 'pbuilder --build --buildresult {1} {0}'.format(
dsc, results_dir)

cmd = 'pbuilder --build {0}'.format(dsc)
__salt__['cmd.run'](cmd, runas=runas, python_shell=True)

# ignore local deps generated package file
for bfile in os.listdir(results_dir):
full = os.path.join(results_dir, bfile)
bdist = os.path.join(dest_dir, bfile)
shutil.copy(full, bdist)
ret.setdefault('Packages', []).append(bdist)
if bfile != 'Packages':
full = os.path.join(results_dir, bfile)
bdist = os.path.join(dest_dir, bfile)
shutil.copy(full, bdist)
ret.setdefault('Packages', []).append(bdist)

except Exception as exc:
log.error('Error building from {0}: {1}'.format(dsc, exc))
finally:
shutil.rmtree(results_dir)

# remove any Packages file created for local dependency processing
for pkgzfile in os.listdir(dest_dir):
if pkgzfile == 'Packages':
pkgzabsfile = os.path.join(dest_dir, pkgzfile)
os.remove(pkgzabsfile)

shutil.rmtree(dsc_dir)
return ret
Expand Down