schema/spacewalk
by Justin Sherrill
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/505-rhnServerFveCapable.sql | 55 ++++++++++
1 file changed, 55 insertions(+)
New commits:
commit a681392d1aa47ab68eb2c70e942bc10e9fd0c3db
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Sep 29 12:27:53 2010 -0400
634263 - adding upgrade for previous commit
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/505-rhnServerFveCapable.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/505-rhnServerFveCapable.sql
new file mode 100644
index 0000000..c06baa7
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/505-rhnServerFveCapable.sql
@@ -0,0 +1,55 @@
+--
+-- Copyright (c) 2008 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+--
+-- A view to list systems that fve capable but that are not actually using
+-- and fve entitlement
+create or replace view
+rhnServerFveCapable (
+ server_id,
+ server_org_id,
+ channel_family_id,
+ current_members,
+ max_members,
+ channel_family_name
+)
+as
+select S.id as server_id,
+ S.org_id as server_org_id,
+ cf.id as channel_family_id,
+ pcf.FVE_CURRENT_MEMBERS as current_members,
+ pcf.FVE_MAX_MEMBERS as max_members,
+ cf.name as channel_family_name
+from
+ RhnVirtualInstance vi
+ inner join rhnServer s on vi.virtual_system_id = s.id
+ inner join rhnServerChannel sc on sc.server_id = s.id
+ inner join rhnChannelFamilyMembers cfm on cfm.channel_id = sc.channel_id
+ inner join rhnChannelFamily cf on cf.id = cfm.channel_family_id
+ inner join rhnPrivateChannelFamily pcf on pcf.channel_family_id = cf.id and pcf.org_id = s.org_id
+where sc.is_fve = 'N'
+ AND (vi.host_system_id is null OR
+ exists (
+ select sg.id
+ from rhnServerGroupMembers sgm
+ inner join rhnServerGroup sg on sgm.server_group_id = sg.id
+ inner join rhnServerGroupType sgt on sgt.id = sg.group_type
+ inner join rhnServer s2 on s2.id = sgm.server_id
+ where
+ s2.id = vi.host_system_id
+ and sgt.label not in ('virtualization_host' ,'virtualization_host_platform') )
+ );
+
13 years, 7 months
schema/spacewalk
by Justin Sherrill
schema/spacewalk/common/views/rhnServerFveCapable.sql | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 441c148d2f26e6b34fd1c3265c37dc11a273eb93
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Sep 29 12:23:50 2010 -0400
634263 - fixing issue where converting host from virt entitled to not, would cause guests registered in other orgs to consume a regular entitelment even when a flex was available
diff --git a/schema/spacewalk/common/views/rhnServerFveCapable.sql b/schema/spacewalk/common/views/rhnServerFveCapable.sql
index bc28434..c06baa7 100644
--- a/schema/spacewalk/common/views/rhnServerFveCapable.sql
+++ b/schema/spacewalk/common/views/rhnServerFveCapable.sql
@@ -49,8 +49,7 @@ where sc.is_fve = 'N'
inner join rhnServerGroupType sgt on sgt.id = sg.group_type
inner join rhnServer s2 on s2.id = sgm.server_id
where
- s2.org_id = s.org_id
- and s2.id = vi.host_system_id
+ s2.id = vi.host_system_id
and sgt.label not in ('virtualization_host' ,'virtualization_host_platform') )
);
13 years, 7 months
Changes to 'refs/tags/spacecmd-0.7.3-1'
by aparsons
Tag 'spacecmd-0.7.3-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-09-28 21:48 +0000
Tagging package [spacecmd] version [0.7.3-1] in directory [spacecmd/].
Changes since spacewalk-java-1.2.46-1:
Aron Parsons (6):
spacecmd: allow configchannel_addfile to be run non-interactively
spacecmd: force the user to enter a valid channel name in configchannel_addfile
spacecmd: allow the user to provide a revision number in configchannel_addfile
Automatic commit of package [spacecmd] release [0.7.2-1].
spacecmd: forgot to add the actual option for revision in configchannel_addfile
Automatic commit of package [spacecmd] release [0.7.3-1].
---
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 14 +
spacecmd/src/lib/configchannel.py | 302 ++++++++++++++++++++++++--------------
3 files changed, 209 insertions(+), 109 deletions(-)
---
13 years, 7 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/configchannel.py | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2009a3f917a988fecab432e21c052d7b9ef9d2ec
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:48:42 2010 -0400
Automatic commit of package [spacecmd] release [0.7.3-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index b69ed61..38a34e3 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-0.7.2-1 spacecmd/
+0.7.3-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index d66d672..26e83cf 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -57,6 +57,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Tue Sep 28 2010 Aron Parsons <aparsons(a)redhat.com> 0.7.3-1
+- forgot to add the actual option for revision in
+ configchannel_addfile (aparsons(a)redhat.com)
* Tue Sep 28 2010 Aron Parsons <aparsons(a)redhat.com> 0.7.2-1
- allow the user to provide a revision number in
configchannel_addfile (aparsons(a)redhat.com)
commit 2e590a7907247e4d2d9bd571684da84495cd45ee
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:48:23 2010 -0400
spacecmd: forgot to add the actual option for revision in configchannel_addfile
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 1a984e8..91ee978 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -300,6 +300,7 @@ def do_configchannel_addfile(self, args, update_path=''):
Option('-x', '--selinux-ctx', action='store'),
Option('-t', '--target-path', action='store'),
Option('-f', '--file', action='store'),
+ Option('-r', '--revision', action='store'),
Option('-s', '--symlink', action='store_true'),
Option('-d', '--directory', action='store_true') ]
13 years, 7 months
Changes to 'refs/tags/spacecmd-0.7.2-1'
by aparsons
Tag 'spacecmd-0.7.2-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-09-28 21:42 +0000
Tagging package [spacecmd] version [0.7.2-1] in directory [spacecmd/].
Changes since spacewalk-branding-1.2.2-1:
Aron Parsons (4):
spacecmd: allow configchannel_addfile to be run non-interactively
spacecmd: force the user to enter a valid channel name in configchannel_addfile
spacecmd: allow the user to provide a revision number in configchannel_addfile
Automatic commit of package [spacecmd] release [0.7.2-1].
Justin Sherrill (4):
637696 - fixing issue where kickstart could hang, either because of a rhel 5.5 kernel panic, or because RHEL 6 does not allow pre-scripts to continue running in the background
adding ext4 support for duplicate systems
fixing issue where kickstarts woudl not show up for provisioning if the distro was created since the last tomcat restart
fixing possible ISE where a cobbler system record already exists, but is not associated to a system when re-provisioning is initiated
Shannon Hughes (1):
636610 alternative set add due to ibm jvm issue
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 4
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 34 -
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2
java/conf/cobbler/snippets/keep_system_id | 16
java/conf/cobbler/snippets/post_reactivation_key | 15
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 11
spacecmd/src/lib/configchannel.py | 301 ++++++----
8 files changed, 240 insertions(+), 145 deletions(-)
---
13 years, 7 months
4 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 11 +
spacecmd/src/lib/configchannel.py | 301 ++++++++++++++++++++++++--------------
3 files changed, 205 insertions(+), 109 deletions(-)
New commits:
commit 5464a468b4e61548f520d9d6c7da0235030c23f1
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:42:33 2010 -0400
Automatic commit of package [spacecmd] release [0.7.2-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 53f5d1e..b69ed61 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-0.7.1-1 spacecmd/
+0.7.2-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 3d380a5..d66d672 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -57,6 +57,15 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Tue Sep 28 2010 Aron Parsons <aparsons(a)redhat.com> 0.7.2-1
+- allow the user to provide a revision number in
+ configchannel_addfile (aparsons(a)redhat.com)
+- force the user to enter a valid channel name in
+ configchannel_addfile (aparsons(a)redhat.com)
+- allow configchannel_addfile to be run non-interactively
+ (aparsons(a)redhat.com)
+- don't use mergeErrataWithPackages API (aparsons(a)redhat.com)
+
* Thu Sep 23 2010 Aron Parsons <aparsons(a)redhat.com> 0.7.1-1
- allow configchannel_create to be called non-interactively
(aparsons(a)redhat.com)
commit f940b0290d2e2057894977b04638a985224de962
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:41:55 2010 -0400
spacecmd: allow the user to provide a revision number in configchannel_addfile
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 7ab13c3..1a984e8 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -278,6 +278,7 @@ def help_configchannel_addfile(self):
options:
-c CHANNEL
-p PATH
+ -r REVISION
-o OWNER [default: root]
-g GROUP [default: root]
-m MODE [defualt: 0644]
@@ -392,6 +393,7 @@ def do_configchannel_addfile(self, args, update_path=''):
mode_input = prompt_user('Mode [%s]:' % options.mode)
selinux_input = \
prompt_user('SELinux Context [%s]:' % options.selinux_ctx)
+ revision_input = prompt_user('Revision [next]:')
if owner_input:
options.owner = owner_input
@@ -405,6 +407,12 @@ def do_configchannel_addfile(self, args, update_path=''):
if selinux_input:
options.selinux_ctx = selinux_input
+ if revision_input:
+ try:
+ options.revision = int(revision_input)
+ except:
+ logging.warning('The revision must be an integer')
+
if not options.directory:
if self.user_confirm('Read an existing file [y/N]:',
nospacer = True, ignore_yes = True):
@@ -470,6 +478,11 @@ def do_configchannel_addfile(self, args, update_path=''):
print 'Mode: %s' % file_info['permissions']
print 'SELinux Context: %s' % file_info['selinux_ctx']
+ # only add the revision field if the user supplied it
+ if options.revision:
+ file_info['revision'] = options.revision
+ print 'Revision: %i' % file_info['revision']
+
if not options.directory:
print
print 'Contents'
commit 2eb39d418e9bd2da4aed5d0c67d146a5bcafc5e8
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:32:44 2010 -0400
spacecmd: force the user to enter a valid channel name in configchannel_addfile
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 63d4725..7ab13c3 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -312,12 +312,22 @@ def do_configchannel_addfile(self, args, update_path=''):
if len(args):
options.channel = args[0]
else:
- print 'Configuration Channels'
- print '----------------------'
- print '\n'.join(sorted(self.do_configchannel_list('', True)))
- print
+ while True:
+ print 'Configuration Channels'
+ print '----------------------'
+ print '\n'.join(sorted(self.do_configchannel_list('', True)))
+ print
+
+ options.channel = prompt_user('Select:', noblank = True)
- options.channel = prompt_user('Select:', noblank = True)
+ # ensure the user enters a valid configuration channel
+ if options.channel in self.do_configchannel_list('', True):
+ break
+ else:
+ print
+ logging.warning('%s is not a valid channel' % \
+ options.channel)
+ print
if update_path:
options.path = update_path
commit b3f6b6b36063fca5872fc6a7fbdb7c3f02b4db0f
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Sep 28 17:25:54 2010 -0400
spacecmd: allow configchannel_addfile to be run non-interactively
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 2968f78..63d4725 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -149,7 +149,7 @@ def do_configchannel_filedetails(self, args):
# grab the first item since we only do one file
details = results[0]
- print 'File: %s' % details.get('path')
+ print 'Path: %s' % details.get('path')
print 'Type: %s' % details.get('type')
print 'Revision: %i' % details.get('revision')
print 'Created: %s' % details.get('creation')
@@ -273,145 +273,210 @@ def do_configchannel_delete(self, args):
def help_configchannel_addfile(self):
print 'configchannel_addfile: Create a configuration file'
- print 'usage: configchannel_addfile CHANNEL'
+ print '''usage: configchannel_addfile [CHANNEL] [options]
+
+options:
+ -c CHANNEL
+ -p PATH
+ -o OWNER [default: root]
+ -g GROUP [default: root]
+ -m MODE [defualt: 0644]
+ -x SELINUX_CONTEXT
+ -d path is a directory
+ -s path is a symlink
+ -t SYMLINK_TARGET
+ -f local path to file contents'''
def complete_configchannel_addfile(self, text, line, beg, end):
return tab_completer(self.do_configchannel_list('', True), text)
-def do_configchannel_addfile(self, args, path=''):
- (args, options) = parse_arguments(args)
+def do_configchannel_addfile(self, args, update_path=''):
+ options = [ Option('-c', '--channel', action='store'),
+ Option('-p', '--path', action='store'),
+ Option('-o', '--owner', action='store'),
+ Option('-g', '--group', action='store'),
+ Option('-m', '--mode', action='store'),
+ Option('-x', '--selinux-ctx', action='store'),
+ Option('-t', '--target-path', action='store'),
+ Option('-f', '--file', action='store'),
+ Option('-s', '--symlink', action='store_true'),
+ Option('-d', '--directory', action='store_true') ]
- if len(args) != 1:
- self.help_configchannel_addfile()
- return
-
- channel = args[0]
+ (args, options) = parse_arguments(args, options)
- # defaults
- owner = 'root'
- group = 'root'
- mode = '644'
+ # initialize here instead of multiple times below
contents = ''
- target_path = ''
- selinux_ctx = ''
- symlink = False
- while path == '':
- path = prompt_user('Path:')
-
- # check if this file already exists
- try:
- fileinfo = self.client.configchannel.lookupFileInfo(self.session,
- channel,
- [ path ])
- except:
- fileinfo = None
-
- # use existing values if available
- if fileinfo:
- for info in fileinfo:
- if info.get('path') == path:
- owner = info.get('owner')
- group = info.get('group')
- mode = info.get('permissions_mode')
- contents = info.get('contents')
- target_path = info.get('target_path')
- selinux_ctx = info.get('selinux_ctx')
-
- if info.get('type') == 'symlink':
- symlink = True
-
- # if this is a new file, ask if it's a symlink
- if not symlink:
- userinput = prompt_user('Symlink [y/N]:')
- if re.match('y', userinput, re.I):
- symlink = True
+ if is_interactive(options):
+ # the channel name can be passed in
+ if len(args):
+ options.channel = args[0]
else:
- symlink = False
+ print 'Configuration Channels'
+ print '----------------------'
+ print '\n'.join(sorted(self.do_configchannel_list('', True)))
+ print
- if symlink:
- target_input = prompt_user('Target Path [%s]:' % target_path)
- selinux_input = prompt_user('SELinux Context [%s]:' % selinux_ctx)
+ options.channel = prompt_user('Select:', noblank = True)
- if target_input:
- target_path = target_input
+ if update_path:
+ options.path = update_path
+ else:
+ options.path = prompt_user('Path:', noblank = True)
+
+ # check if this file already exists
+ try:
+ fileinfo = \
+ self.client.configchannel.lookupFileInfo(self.session,
+ options.channel,
+ [ options.path ])
+ except:
+ fileinfo = None
+
+ # use existing values if available
+ if fileinfo:
+ for info in fileinfo:
+ if info.get('path') == options.path:
+ logging.debug('Found existing file in channel')
+
+ options.owner = info.get('owner')
+ options.group = info.get('group')
+ options.mode = info.get('permissions_mode')
+ options.target_path = info.get('target_path')
+ options.selinux_ctx = info.get('selinux_ctx')
+ contents = info.get('contents')
+
+ if info.get('type') == 'symlink':
+ options.symlink = True
+
+ if not options.owner: options.owner = 'root'
+ if not options.group: options.group = 'root'
+ if not options.mode: options.mode = '0644'
+
+ # if this is a new file, ask if it's a symlink
+ if not options.symlink:
+ userinput = prompt_user('Symlink [y/N]:')
+ if re.match('y', userinput, re.I):
+ options.symlink = True
+ else:
+ options.symlink = False
- if selinux_input:
- selinux_ctx = selinux_input
+ if options.symlink:
+ target_input = prompt_user('Target Path:', noblank = True)
+ selinux_input = prompt_user('SELinux Context [none]:')
- file_info = { 'target_path' : target_path,
- 'selinux_ctx' : selinux_ctx }
+ if target_input:
+ options.target_path = target_input
- print 'File: %s' % path
- print 'Target Path: %s' % target_path
- print 'SELinux Context: %s' % selinux_ctx
- else:
- userinput = prompt_user('Directory [y/N]:')
- if re.match('y', userinput, re.I):
- directory = True
+ if selinux_input:
+ options.selinux_ctx = selinux_input
else:
- directory = False
+ userinput = prompt_user('Directory [y/N]:')
+ if re.match('y', userinput, re.I):
+ options.directory = True
+ else:
+ options.directory = False
+
+ owner_input = prompt_user('Owner [%s]:' % options.owner)
+ group_input = prompt_user('Group [%s]:' % options.group)
+ mode_input = prompt_user('Mode [%s]:' % options.mode)
+ selinux_input = \
+ prompt_user('SELinux Context [%s]:' % options.selinux_ctx)
+
+ if owner_input:
+ options.owner = owner_input
+
+ if group_input:
+ options.group = group_input
+
+ if mode_input:
+ options.mode = mode_input
+
+ if selinux_input:
+ options.selinux_ctx = selinux_input
+
+ if not options.directory:
+ if self.user_confirm('Read an existing file [y/N]:',
+ nospacer = True, ignore_yes = True):
+ options.file = prompt_user('File:')
+ contents = read_file(options.file)
+ else:
+ if contents:
+ template = contents
+ else:
+ template = ''
+
+ contents = editor(template = template, delete = True)
+ else:
+ if not options.path:
+ logging.error('The path is required')
+ return
- owner_input = prompt_user('Owner [%s]:' % owner)
- group_input = prompt_user('Group [%s]:' % group)
- mode_input = prompt_user('Permissions [%s]:' % mode)
- selinux_input = prompt_user('SELinux Context [%s]:' % selinux_ctx)
+ if not options.symlink and not options.directory:
+ if options.file:
+ contents = read_file(options.file)
+ else:
+ logging.error('You must provide the file contents')
+ return
- if owner_input:
- owner = owner_input
+ if options.symlink and not options.target_path:
+ logging.error('You must provide the target path for a symlink')
+ return
- if group_input:
- group = group_input
+ # selinux_ctx can't be None
+ if not options.selinux_ctx:
+ options.selinux_ctx = ''
- if mode_input:
- mode = mode_input
+ # directory can't be None
+ if not options.directory:
+ options.directory = False
- if selinux_input:
- selinux_ctx = selinux_input
+ if options.symlink:
+ file_info = { 'target_path' : options.target_path,
+ 'selinux_ctx' : options.selinux_ctx }
- if not directory:
- if contents:
- template = contents
+ print 'Path: %s' % options.path
+ print 'Target Path: %s' % file_info['target_path']
+ print 'SELinux Context: %s' % file_info['selinux_ctx']
+ else:
+ if not options.owner: options.owner = 'root'
+ if not options.group: options.group = 'root'
+ if not options.mode:
+ if options.directory:
+ options.mode = '0755'
else:
- template = ''
-
- contents = editor(template = template, delete = True)
+ options.mode = '0644'
file_info = { 'contents' : ''.join(contents),
- 'owner' : owner,
- 'group' : group,
- 'selinux_ctx' : selinux_ctx,
- 'permissions' : mode }
+ 'owner' : options.owner,
+ 'group' : options.group,
+ 'selinux_ctx' : options.selinux_ctx,
+ 'permissions' : options.mode }
- print 'File: %s' % path
- print 'Directory: %s' % directory
+ print 'Path: %s' % options.path
+ print 'Directory: %s' % options.directory
print 'Owner: %s' % file_info['owner']
print 'Group: %s' % file_info['group']
print 'Mode: %s' % file_info['permissions']
- print 'SELinux Context: %s' % selinux_ctx
+ print 'SELinux Context: %s' % file_info['selinux_ctx']
- if not directory:
+ if not options.directory:
print
print 'Contents'
print '--------'
print file_info['contents']
- # selinux_ctx can't be None
- if not file_info['selinux_ctx']:
- file_info['selinux_ctx'] = ''
-
if self.user_confirm():
- if symlink:
- print file_info
+ if options.symlink:
self.client.configchannel.createOrUpdateSymlink(self.session,
- channel,
- path,
+ options.channel,
+ options.path,
file_info)
else:
self.client.configchannel.createOrUpdatePath(self.session,
- channel,
- path,
- directory,
+ options.channel,
+ options.path,
+ options.directory,
file_info)
####################
@@ -428,9 +493,8 @@ def complete_configchannel_updatefile(self, text, line, beg, end):
text)
elif len(parts) > 2:
channel = parts[1]
- return tab_completer(self.do_configchannel_listfiles(channel,
- True),
- text)
+ return tab_completer(self.do_configchannel_listfiles(channel, True),
+ text)
def do_configchannel_updatefile(self, args):
(args, options) = parse_arguments(args)
@@ -439,7 +503,7 @@ def do_configchannel_updatefile(self, args):
self.help_configchannel_updatefile()
return
- return self.do_configchannel_addfile(args[0], path=args[1])
+ return self.do_configchannel_addfile(args[0], update_path = args[1])
####################
13 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.2.46-1'
by Shannon Hughes
Tag 'spacewalk-java-1.2.46-1' created by Shannon Hughes <shughes(a)redhat.com> at 2010-09-28 21:32 +0000
Tagging package [spacewalk-java] version [1.2.46-1] in directory [java/].
Changes since spacewalk-branding-1.2.2-1:
Justin Sherrill (4):
637696 - fixing issue where kickstart could hang, either because of a rhel 5.5 kernel panic, or because RHEL 6 does not allow pre-scripts to continue running in the background
adding ext4 support for duplicate systems
fixing issue where kickstarts woudl not show up for provisioning if the distro was created since the last tomcat restart
fixing possible ISE where a cobbler system record already exists, but is not associated to a system when re-provisioning is initiated
Shannon Hughes (3):
636610 alternative set add due to ibm jvm issue
checkstyle fixes
Automatic commit of package [spacewalk-java] release [1.2.46-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 34 +++++-----
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2
java/conf/cobbler/snippets/keep_system_id | 16 +---
java/conf/cobbler/snippets/post_reactivation_key | 15 ++--
java/spacewalk-java.spec | 15 ++++
rel-eng/packages/spacewalk-java | 2
7 files changed, 50 insertions(+), 38 deletions(-)
---
13 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Shannon Hughes
java/spacewalk-java.spec | 15 ++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit a9fdc863e1ad9fa5e9408fd6ba5b9b061b944825
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Sep 28 17:32:01 2010 -0400
Automatic commit of package [spacewalk-java] release [1.2.46-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6e36e04..aa26969 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.45
+Version: 1.2.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,19 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Sep 28 2010 Shannon Hughes <shughes(a)redhat.com> 1.2.46-1
+- checkstyle fixes (shughes(a)redhat.com)
+- 636610 alternative set add due to ibm jvm issue (shughes(a)redhat.com)
+- fixing possible ISE where a cobbler system record already exists, but is not
+ associated to a system when re-provisioning is initiated
+ (jsherril(a)redhat.com)
+- fixing issue where kickstarts woudl not show up for provisioning if the
+ distro was created since the last tomcat restart (jsherril(a)redhat.com)
+- adding ext4 support for duplicate systems (jsherril(a)redhat.com)
+- 637696 - fixing issue where kickstart could hang, either because of a rhel
+ 5.5 kernel panic, or because RHEL 6 does not allow pre-scripts to continue
+ running in the background (jsherril(a)redhat.com)
+
* Mon Sep 27 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.45-1
- Revert "591291 - added new API calls
channel.software.mergeErrataWithPackages" (aparsons(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 825be3e..cbf1e3e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.45-1 java/
+1.2.46-1 java/
13 years, 7 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0b7b1523ae2c20664a2841fa21f5ca6fae91468a
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Sep 28 17:28:28 2010 -0400
checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
index 3fbf696..24d8ccb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
@@ -184,7 +184,7 @@ public class SystemMigrateAction extends RhnAction {
protected void setupPageAndFormValues(HttpServletRequest request,
DynaActionForm daForm, User user, Server s, Org o, Integer trustedOrgCount) {
- //ibm jdk had issues with adding set in constructor of ArrayList so we add separately
+ //ibm jvm has issues adding set in ArrayList constructor so add separately
Set set = user.getOrg().getTrustedOrgs();
List orgList = new ArrayList();
orgList.add(set);
13 years, 7 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 34 +++++-----
1 file changed, 19 insertions(+), 15 deletions(-)
New commits:
commit c3ef62f472cd10c92508128a435e88a86ce4b694
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue Sep 28 17:23:55 2010 -0400
636610 alternative set add due to ibm jvm issue
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
index a0b1dda..3fbf696 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
@@ -14,6 +14,21 @@
*/
package com.redhat.rhn.frontend.action.systems.sdc;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
@@ -26,20 +41,6 @@ import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.org.MigrationManager;
import com.redhat.rhn.manager.system.SystemManager;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.DynaActionForm;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* SystemDetailsEditAction
* @version $Rev$
@@ -183,7 +184,10 @@ public class SystemMigrateAction extends RhnAction {
protected void setupPageAndFormValues(HttpServletRequest request,
DynaActionForm daForm, User user, Server s, Org o, Integer trustedOrgCount) {
- List orgList = new ArrayList(user.getOrg().getTrustedOrgs());
+ //ibm jdk had issues with adding set in constructor of ArrayList so we add separately
+ Set set = user.getOrg().getTrustedOrgs();
+ List orgList = new ArrayList();
+ orgList.add(set);
request.setAttribute("trustedOrgCount", trustedOrgCount);
request.setAttribute("system", s);
13 years, 7 months