summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2010-07-06 16:19:57 -0400
committerBill Peck <bpeck@redhat.com>2010-07-06 16:19:57 -0400
commitca53b7b72da88fd2bcb6582e2a09215436dbacfe (patch)
tree756b031206c49a1912107357b692100c12e43c1a
parentfc5b462677ebecdf621b7c238edd9f3780c81d47 (diff)
-rw-r--r--Server/bkr/server/model.py6
-rwxr-xr-xServer/bkr/server/tools/init.py3
-rw-r--r--beaker.spec7
3 files changed, 10 insertions, 6 deletions
diff --git a/Server/bkr/server/model.py b/Server/bkr/server/model.py
index 5fd0ffb..98430c3 100644
--- a/Server/bkr/server/model.py
+++ b/Server/bkr/server/model.py
@@ -452,8 +452,8 @@ activity_table = Table('activity', metadata,
Column('field_name', String(40), nullable=False),
Column('service', String(100), nullable=False),
Column('action', String(40), nullable=False),
- Column('old_value', String(40)),
- Column('new_value', String(40))
+ Column('old_value', String(60)),
+ Column('new_value', String(60))
)
system_activity_table = Table('system_activity', metadata,
@@ -1854,7 +1854,7 @@ $SNIPPET("rhts_post")
)
)
)
- if self.type.type == 'Machine':
+ if self.type.type != 'Virtual':
distros = distros.filter(distro_table.c.virt==False)
return distros
diff --git a/Server/bkr/server/tools/init.py b/Server/bkr/server/tools/init.py
index e0f5ab0..224551d 100755
--- a/Server/bkr/server/tools/init.py
+++ b/Server/bkr/server/tools/init.py
@@ -91,7 +91,8 @@ def main():
machine = SystemType(u'Machine')
virtual = SystemType(u'Virtual')
resource = SystemType(u'Resource')
- laptop = SystemType(u'Laptop')
+ laptop = SystemType(u'Laptop')
+ prototype = SystemType(u'Prototype')
#Setup base Architectures
if Arch.query().count() == 0:
diff --git a/beaker.spec b/beaker.spec
index db4dbe9..a63227d 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -6,8 +6,8 @@
%endif
Name: beaker
-Version: 0.5.46
-Release: 5%{?timestamp}%{?branch}%{?dist}
+Version: 0.5.47
+Release: 0%{?timestamp}%{?branch}%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
License: GPLv2+
@@ -185,6 +185,9 @@ fi
%{_sysconfdir}/init.d/%{name}-watchdog
%changelog
+* Tue Jul 06 2010 Bill Peck <bpeck@redhat.com> - 0.5.47-0
+- proper release
+
* Tue Jul 06 2010 Bill Peck <bpeck@redhat.com> - 0.5.46-5
- bz598878, minor update to code to not need split(',')
- bz572798, Missing conditions/events in history view.