diff options
| author | Bill Peck <bpeck@redhat.com> | 2010-03-03 20:21:48 -0500 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2010-03-03 20:21:48 -0500 |
| commit | c05c872c1369b8c88de436f8c8a1fe10fb5cf093 (patch) | |
| tree | 813eb1e7c7a7c85952384f78e06e1894038c8a22 | |
| parent | fcba664cc52200480b14a59fe9d9c6eb71860ad9 (diff) | |
bumpbeaker-0_4_87
| -rwxr-xr-x | LabController/triggers/sync/post/osversion.trigger | 15 | ||||
| -rw-r--r-- | beaker.spec | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/LabController/triggers/sync/post/osversion.trigger b/LabController/triggers/sync/post/osversion.trigger index 5383832..63c9c08 100755 --- a/LabController/triggers/sync/post/osversion.trigger +++ b/LabController/triggers/sync/post/osversion.trigger @@ -283,6 +283,7 @@ if __name__ == '__main__': if distro['name'].find('_nfs-') == -1: continue VARIANT='' + FAMILYUPDATE=None DISTPATH='nightly' if distro['ks_meta']['tree'].find('/rel-eng/') != -1: DISTPATH='rel-eng' @@ -295,15 +296,17 @@ if __name__ == '__main__': VARIANT = curr_variant break TPATH = DISTPATH + ''.join(distro['ks_meta']['tree'].split(DISTPATH,1)[1:]) - FAMILYUPDATE=release.search(distro['comment']).group(1) + if release.search(distro['comment']): + FAMILYUPDATE=release.search(distro['comment']).group(1) if variant_search.search(distro['comment']): VARIANT = variant_search.search(distro['comment']).group(1) #addDistro.sh rel-eng RHEL6.0-20090626.2 RedHatEnterpriseLinux6.0 x86_64 Default rel-eng/RHEL6.0-20090626.2/6/x86_64/os - cmd = '%s %s %s %s %s "%s" %s' % (addDistroCmd, DISTPATH, DIST, - FAMILYUPDATE, distro['arch'], - VARIANT, TPATH) - print cmd - os.system(cmd) + if FAMILYUPDATE: + cmd = '%s %s %s %s %s "%s" %s' % (addDistroCmd, DISTPATH, DIST, + FAMILYUPDATE, distro['arch'], + VARIANT, TPATH) + print cmd + os.system(cmd) for distro in push_distros: comment = "%s\nPUSHED" % distro['comment'] diff --git a/beaker.spec b/beaker.spec index c4a5398..bd768d6 100644 --- a/beaker.spec +++ b/beaker.spec @@ -6,8 +6,8 @@ %endif Name: beaker -Version: 0.4.86 -Release: 1%{?timestamp}%{?branch}%{?dist} +Version: 0.4.87 +Release: 0%{?timestamp}%{?branch}%{?dist} Summary: Filesystem layout for Beaker Group: Applications/Internet License: GPLv2+ @@ -146,6 +146,8 @@ ln -s Fedora.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/Fedoradevelopment.ks /usr/share/man/man1/beakerlib* %changelog +* Wed Mar 03 2010 Bill Peck <bpeck@redhat.com> - 0.4.87-0 +- fixed osversion.trigger, FAMILYUPDATE may not exist for some distros. * Tue Mar 02 2010 Bill Peck <bpeck@redhat.com> - 0.4.86-1 - fixed osversion.trigger, Distro -> distro. - extend visit timeout to 6 hours by default. |