diff options
| author | Yaakov M. Nemoy <loupgaroublond@gmail.com> | 2009-01-05 13:50:32 -0500 |
|---|---|---|
| committer | Yaakov M. Nemoy <loupgaroublond@gmail.com> | 2009-01-05 13:50:32 -0500 |
| commit | de3320e82e5a14fe54ebb27a0ef0c0cb381128f4 (patch) | |
| tree | 131e399b7a1391fcb368396c2c931c2d11b9ac04 /base | |
| parent | 5cada39e063281f8f0be7a55f4ce2d30ae5432a9 (diff) | |
| download | fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.tar.gz fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.tar.xz fedora-devshell-de3320e82e5a14fe54ebb27a0ef0c0cb381128f4.zip | |
fixed package to differentiate between canonical name and rpm name
Diffstat (limited to 'base')
| -rw-r--r-- | base/profiles.py | 7 | ||||
| -rw-r--r-- | base/util.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/base/profiles.py b/base/profiles.py index 14ba17e..83bfe25 100644 --- a/base/profiles.py +++ b/base/profiles.py @@ -58,13 +58,18 @@ def dir_defines(some_dir): defs.append(define('_rpmdir', join(some_dir, 'RPMS'))) return join_defines(defs) -def ver_rel(spec_file, defines): +def ver_rel(spec_file, defines=''): rpm_p = Popen('rpm %s -q --qf "%%{VERSION} %%{RELEASE}\n" --specfile %s' % \ (defines, spec_file), stdout=PIPE, shell=True) verrels = rpm_p.communicate()[0] verrel = verrels.split('\n')[0] return verrel.split(' ') +def name(spec_file, defines=''): + rpm_p = Popen('rpm %s -q --qf "%%{NAME}\n" --specfile %s' % \ + (defines, spec_file), stdout=PIPE, shell=True) + return rpm_p.communicate()[0].split('\n')[0] + #taken from CVS for now distro = [{'RHL-7':('rhl7','.rhl7','rhl','7'), 'RHL-8':('rhl8','.rhl8','rhl','8'), diff --git a/base/util.py b/base/util.py index d24755e..5b68c3b 100644 --- a/base/util.py +++ b/base/util.py @@ -44,7 +44,7 @@ def log_file(fname): fout.write("-- Beginning log of %s at %s --\n" % (fname, datetime.now().isoformat(' '))) fout.flush() yield fout - fout.write("-- Ending log of %s at %s --\n" % (fname, datetime.now().isoformat(' '))) + fout.write("-- Ending log of %s at %s --\n\n" % (fname, datetime.now().isoformat(' '))) def rm(tgt): if isdir(tgt): @@ -69,11 +69,13 @@ def symlink(src, dst): if lexists(dst): rm(dst) sym(abspath(src), abspath(dst)) + return dst def move(src, dst): if lexists(dst): rm(dst) mv(src, dst) + return dst def one(l, f): for x in l: |