client/tools
by Partha Aji
client/tools/rhncfg/config_client/rhncfgcli_elist.py | 3 +--
client/tools/rhncfg/config_client/rhncfgcli_list.py | 16 +++++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit b6f6ba4c08816ecaba9a5f94dd5bc3db34b14210
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Jul 29 13:22:43 2010 -0400
Config Client changes to get symlinks to work
For rhncfgclient-list and elist calls
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_elist.py b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
index 9adf8be..dcb5102 100755
--- a/client/tools/rhncfg/config_client/rhncfgcli_elist.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
@@ -93,7 +93,6 @@ class Handler(handler_base.HandlerBase):
# Get the file info
finfo = r.get_file_info(file[1])[1]
-
# Get the file length
if finfo['encoding'] == 'base64':
fsize = len(base64.decodestring(finfo['file_contents']))
@@ -101,6 +100,6 @@ class Handler(handler_base.HandlerBase):
# * indicates raw 'unencoded' size
fsize = '*' + str(len(finfo['file_contents']))
- permstr = self.ostr_to_sym(finfo['filemode'], finfo['filetype'])
+ permstr = finfo['filetype'] != 'symlink' and self.ostr_to_sym(finfo['filemode'], finfo['filetype']) or ''
print "%10s %8s %-8s %10s %+3s %*s %s" % (permstr, finfo['username'], finfo['groupname'], fsize, finfo['revision'], maxlen, file[0], file[1])
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_list.py b/client/tools/rhncfg/config_client/rhncfgcli_list.py
index 3e2615d..ae597b2 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_list.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_list.py
@@ -34,10 +34,12 @@ class Handler(handler_base.HandlerBase):
print "DoF %*s %s" % (maxlen, label, "File")
for file in files:
- # checking to see if the filetype is in the 'file' entry,
- # and if it is and that type is '1', it is a file
- if (len(file) < 3) or file[2] == 1:
- print "F %*s %s" % (maxlen, file[0], file[1])
- else:
- # the filetype is a directory
- print "D %*s %s" % (maxlen, file[0], file[1])
+ # checking to see if the filetype is in the 'file' entry,
+ # and if it is and that type is '1', it is a file
+ if (len(file) < 3) or file[2] == 1:
+ print "F %*s %s" % (maxlen, file[0], file[1])
+ elif file[2] == 2 :
+ # the filetype is a directory
+ print "D %*s %s" % (maxlen, file[0], file[1])
+ else:
+ print "S %*s %s" % (maxlen, file[0], file[1])
13 years, 8 months
2 commits - rel-eng/packages spacewalk/setup
by Justin Sherrill
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 314251a775e60dbea28b9edd42dc58c100576bcc
Merge: 2af3ca0... 025d353...
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 29 12:48:03 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/spacewalk
commit 2af3ca0cdfee14a17c49ea966ada72ac010dd196
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 29 11:13:07 2010 -0400
Automatic commit of package [spacewalk-setup] release [1.1.14-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index fd92f74..42c195a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.1.13-1 spacewalk/setup/
+1.1.14-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 1d634d8..7b212e3 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.1.13
+Version: 1.1.14
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Jul 29 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.14-1
+- 531719 - making pxe_just_once set to 1 by default on a spacewalk install
+ (jsherril(a)redhat.com)
+
* Fri Jul 23 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.13-1
- db-sid is now db-name
13 years, 8 months
3 commits - backend/server client/tools
by Miroslav Suchý
backend/server/handlers/config/rhn_config_management.py | 10 ++++++++++
backend/server/handlers/xmlrpc/queue.py | 2 ++
client/tools/rhncfg/config_client/rpc_cli_repository.py | 16 ++++++++--------
3 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 025d3530215dd479acde563114d183a46477f02d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 23 15:23:47 2010 +0200
send only actions which we are able to cache
safe traffic and do not send actions which sents a lot of data, but we are unable to cache it. yet.
e.g. config.*
diff --git a/backend/server/handlers/xmlrpc/queue.py b/backend/server/handlers/xmlrpc/queue.py
index a62e692..1accc25 100644
--- a/backend/server/handlers/xmlrpc/queue.py
+++ b/backend/server/handlers/xmlrpc/queue.py
@@ -214,6 +214,8 @@ class Queue(rhnHandler):
and a.action_type = at.id
and sa.status in (0, 1) -- Queued or picked up
and a.earliest_action <= sysdate + (:time_window/24) -- Check earliest_action
+ and at.label in ('packages.update', 'errata.update',
+ 'packages.runTransaction', 'packages.fullUpdate')
order by a.earliest_action, a.prerequisite nulls first, a.id
""")
commit c3d3b82c136c91b31b6167137a27a4fc6ed37092
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 23 13:40:55 2010 +0200
code style - whitespace expansion
expand tabs so the file is actually readable even with different tab setting
diff --git a/client/tools/rhncfg/config_client/rpc_cli_repository.py b/client/tools/rhncfg/config_client/rpc_cli_repository.py
index 97f3f5b..411b003 100644
--- a/client/tools/rhncfg/config_client/rpc_cli_repository.py
+++ b/client/tools/rhncfg/config_client/rpc_cli_repository.py
@@ -74,17 +74,17 @@ class ClientRepository(repository.RPC_Repository):
if result.has_key('missing'):
return None
- dirs_created = None
+ dirs_created = None
# Older servers will not return directories; if filetype is missing,
# assume file
- if result.get('filetype') == 'directory':
- if os.path.isfile(result['path']):
- raise cfg_exceptions.DirectoryEntryIsFile(result['path'])
- else:
- auto_delete = 0
- temp_file = result['path']
- else:
+ if result.get('filetype') == 'directory':
+ if os.path.isfile(result['path']):
+ raise cfg_exceptions.DirectoryEntryIsFile(result['path'])
+ else:
+ auto_delete = 0
+ temp_file = result['path']
+ else:
f = file_utils.FileProcessor()
temp_file, dirs_created = f.process(result, directory=dest_directory)
commit 2b3e2b511349acc55dad24eb7a6407950cdbf212
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 23 13:36:42 2010 +0200
add comment to function
I spent dozens minutes trying to find what it does,
safe time to somebody else in future.
diff --git a/backend/server/handlers/config/rhn_config_management.py b/backend/server/handlers/config/rhn_config_management.py
index 5b89e67..f2f2498 100644
--- a/backend/server/handlers/config/rhn_config_management.py
+++ b/backend/server/handlers/config/rhn_config_management.py
@@ -113,6 +113,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
""")
def client_list_files(self, systemid, config_channel=None):
+ """ Return array of files (its path), which we manage on that system. """
log_debug(1)
self.auth_system(systemid)
@@ -150,6 +151,15 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
return result
def client_get_file(self, systemid, filename):
+ """ Returns requested config file.
+ If file do not exist or system is not subscribed to, then we return.
+ {'missing' : 1}
+ Otherwise dictionary is returned. It should contains keys:
+ path, config_channel, file_contents, checksum_type, checksum, delim_start
+ delim_end, revision, username, groupname, filemode, encoding, filetype and
+ selinux_ctx.
+ See server/configFilesHandler.py:format_file_results
+ """
self.auth_system(systemid)
server_id = self.server.getid()
13 years, 8 months
Changes to 'refs/tags/spacewalk-setup-1.1.14-1'
by Justin Sherrill
Tag 'spacewalk-setup-1.1.14-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-29 15:13 +0000
Tagging package [spacewalk-setup] version [1.1.14-1] in directory [spacewalk/setup/].
Changes since spacewalk-schema-1.1.23-1:
Justin Sherrill (2):
531719 - making pxe_just_once set to 1 by default on a spacewalk install
Automatic commit of package [spacewalk-setup] release [1.1.14-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/cobbler-setup | 1 +
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 8 months
spacewalk/setup
by Justin Sherrill
spacewalk/setup/bin/cobbler-setup | 1 +
1 file changed, 1 insertion(+)
New commits:
commit eeac1d23705f7176d3213412525bdae38403af30
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 29 10:50:45 2010 -0400
531719 - making pxe_just_once set to 1 by default on a spacewalk install
diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobbler-setup
index e515288..a225013 100755
--- a/spacewalk/setup/bin/cobbler-setup
+++ b/spacewalk/setup/bin/cobbler-setup
@@ -77,6 +77,7 @@ def main():
answers['redhat_management_server'] = answers['server']
answers['redhat_management_type'] = 'site'
answers['authn_module'] = 'authn_spacewalk'
+ answers['pxe_just_once'] = '1'
gen_template(SETTINGS_TEMPLATE, answers, TEMP_SETTINGS)
gen_template(MODULES_TEMPLATE, answers, TEMP_MODULES)
copy(TEMP_SETTINGS, SETTINGS)
13 years, 8 months
Changes to 'refs/tags/spacewalk-schema-1.1.23-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.1.23-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-07-29 13:00 +0000
Tagging package [spacewalk-schema] version [1.1.23-1] in directory [schema/spacewalk/].
Changes since spacecmd-0.5.4-1:
Aron Parsons (1):
added a missing hyphen in the spacecmd man page
Colin Coe (2):
Fix checkstyle errors
Symlink /var/www/html/pub in devel environment
Jan Pazdziora (2):
The default_db is gone, we need to set the string up for sqlplus to work in spacewalk-schema-upgrade.
Automatic commit of package [spacewalk-schema] release [1.1.23-1].
Justin Sherrill (4):
595524 - changing improper accesses to /ks/dist to return a file not found
514426 - changing list tag behavior to show fliter box even if the user has filtered something and got no results
533190 - fixing issue where deleting more than 1000 errata would throw a database error
563797 - changing behavior of lookup exceptions to print a smaller error as well as not send an email by default
Milan Zazrivec (1):
correct the path to oci
Tomas Lestach (1):
changes due to simple-core gets packaged separatelly
---
dev/null |binary
java/buildconf/build-webapp.xml | 2
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 2
java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java | 22 +++++-----
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 3 -
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 2
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 11 +++++
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 2
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3 -
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema-upgrade | 6 ++
schema/spacewalk/spacewalk-schema.spec | 5 +-
search-server/spacewalk-search/build.properties | 2
search-server/spacewalk-search/spacewalk-search.spec | 2
search-server/spacewalk-search/src/config/rhn-search | 2
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 4 -
spacecmd/src/doc/spacecmd.1 | 2
18 files changed, 52 insertions(+), 23 deletions(-)
---
13 years, 8 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 43e138c36da461f2e13ab73e6e149e070039e5b0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 29 15:00:11 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.1.23-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ed512ed..009d332 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.1.22-1 schema/spacewalk/
+1.1.23-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5a2f6a6..bc74853 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.1.22
+Version: 1.1.23
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Jul 29 2010 Jan Pazdziora 1.1.23-1
+- The default_db is gone, we need to set the string up for sqlplus to work.
+
* Wed Jul 28 2010 Jan Pazdziora 1.1.22-1
- The rhnContentSource.sql defines unique index and not constraint, we should
do the same in schema upgrade scripts.
13 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 82becb53858e11f99ded3e9aab1d401576cd447b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 29 14:58:30 2010 +0200
The default_db is gone, we need to set the string up for sqlplus to work in spacewalk-schema-upgrade.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 8b7a67a..52e240f 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -18,7 +18,11 @@ if (not -e $config_file) {
my %options;
Spacewalk::Setup::read_config($config_file, \%options);
if (not defined $options{default_db}) {
- die "Config file [$config_file] does not seem to have database connection string (default_db) set.\n";
+ if (defined $options{'db_name'} and defined $options{'db_user'} and defined $options{'db_password'}) {
+ $options{default_db} = "$options{'db_user'}/$options{'db_password'}\@$options{'db_name'}";
+ } else {
+ die "Config file [$config_file] does not seem to have database connection string (default_db) set.\n";
+ }
}
my $test = run_query(\%options, "select 1, 2 from dual;");
13 years, 8 months
java/buildconf
by Colin Coe
java/buildconf/build-webapp.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9d2cf80360ac08623629a0ed18c95b1c855c95b9
Author: Colin Coe <coec(a)spacey.coesta.com>
Date: Thu Jul 29 20:29:13 2010 +0800
Symlink /var/www/html/pub in devel environment
diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.xml
index cedc65c..3e0117c 100644
--- a/java/buildconf/build-webapp.xml
+++ b/java/buildconf/build-webapp.xml
@@ -178,6 +178,7 @@
<symlink link="/var/www/html/img" resource="${git.home}/branding/img"/>
<symlink link="/var/www/html/templates" resource="${git.home}/branding/templates"/>
<symlink link="/var/www/html/nav/styles" resource="${git.home}/branding/styles"/>
+ <symlink link="/var/www/html/pub" resource="/var/www/html.old/pub"/>
</target>
<target name="uninstall-web"
@@ -191,6 +192,7 @@
<symlink action="delete" link="/var/www/html/css"/>
<symlink action="delete" link="/var/www/html/templates"/>
<symlink action="delete" link="/var/www/html/nav/styles"/>
+ <symlink action="delete" link="/var/www/html/pub"/>
<symlink action="delete" link="/var/www/html"/>
<move file="/var/www/html.old" tofile="/var/www/html" failonerror="false"/>
</target>
13 years, 8 months
java/code
by Colin Coe
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java | 3 ++-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1d47fe18f964a6075e4a7693a07ed06ade270733
Author: Colin Coe <coec(a)spacey.coesta.com>
Date: Thu Jul 29 18:13:17 2010 +0800
Fix checkstyle errors
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 6dec3ad..5afac8b 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -641,7 +641,7 @@ public class ErrataFactory extends HibernateFactory {
return retval;
}
- /*
+ /**
* Lookup a Security Errata by the synopsis string
* @param synopsis to search for
* @return the Errata found
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
index b82d14e..2816e53 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
@@ -294,7 +294,8 @@ public class ErrataSetupAction extends RhnAction implements Listable {
if (currency) {
return SystemManager.relevantCurrencyErrata(user, sid, eType, synopsis);
- } else {
+ }
+ else {
return SystemManager.relevantErrata(user, sid, typeList);
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 991b66f..ae795f2 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -795,7 +795,8 @@ public class SystemManager extends BaseManager {
* Returns a list of errata relevant to a system
* @param user The user
* @param sid System Id
- * @param types of errata types (strings) to include
+ * @param type of errata to include
+ * @param synopsis to filter by
* @return a list of ErrataOverviews
*/
public static DataResult<ErrataOverview> relevantCurrencyErrata(User user,
13 years, 8 months