Changes to 'refs/tags/spacewalk-backend-1.3.35-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.3.35-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-26 22:25 +0000
Tagging package [spacewalk-backend] version [1.3.35-1] in directory [backend/].
Changes since spacewalk-web-1.3.19-1:
Colin Coe (1):
665693: convert sysdate to current_timestamp
Jan Pazdziora (2):
619083 - we will try not to stringify the types.IntType and types.FloatType.
Automatic commit of package [spacewalk-backend] release [1.3.35-1].
---
backend/server/rhnSQL/sql_base.py | 3 ---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
---
13 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9b8631c37ee70e65b5dbcd09fed1a85a7d8046ce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sun Dec 26 23:25:27 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4dfa407..f4a744f 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.34
+Version: 1.3.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Sun Dec 26 2010 Jan Pazdziora 1.3.35-1
+- 619083 - we will try not to stringify the types.IntType and types.FloatType.
+
* Thu Dec 23 2010 Jan Pazdziora 1.3.34-1
- Need to stringify the epoch.
- fix error from 3fcd9f7cf736e8e85994e45d8cd96943ab5a2832 (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 341bba2..ac747c0 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.34-1 backend/
+1.3.35-1 backend/
13 years, 3 months
backend/server
by Jan Pazdziora
backend/server/rhnSQL/sql_base.py | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 77efefcf49a269db0870a4ec4b49368c77eea6a3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sun Dec 26 23:25:07 2010 +0100
619083 - we will try not to stringify the types.IntType and types.FloatType.
diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py
index ca3692a..b376c82 100644
--- a/backend/server/rhnSQL/sql_base.py
+++ b/backend/server/rhnSQL/sql_base.py
@@ -30,9 +30,6 @@ import types
def adjust_type(val):
""" Adjust data types prior to calling execute(). """
- if type(val) in [types.IntType, types.FloatType]:
- # Convert it to strings to be uniform
- return str(val)
if isinstance(val, types.UnicodeType):
# Represent it as UTF8
return val.encode("UTF8")
13 years, 3 months
spacewalk/setup
by Colin Coe
spacewalk/setup/lib/Spacewalk/Setup.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit dfe456c5bdb4f46decb6004fb256f4d6aaf457ba
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Sun Dec 26 13:47:29 2010 +0800
665693: convert sysdate to current_timestamp
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 467b245..a7a6390 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1540,7 +1540,7 @@ sub update_monitoring_scout {
update rhn_sat_node
set ip = ?,
last_update_user = 'upgrade',
- last_update_date = sysdate
+ last_update_date = current_timestamp
where ip = '127.0.0.1' and
recid = 2};
@@ -1548,7 +1548,7 @@ sub update_monitoring_scout {
update rhn_sat_cluster
set vip = ?,
last_update_user = 'upgrade',
- last_update_date = sysdate
+ last_update_date = current_timestamp
where vip = '127.0.0.1' and
recid = 1};
@@ -1557,7 +1557,7 @@ sub update_monitoring_scout {
update rhn_sat_node
set ip = ?,
last_update_user = 'upgrade',
- last_update_date = sysdate
+ last_update_date = current_timestamp
where ip is null and
recid = 2};
@@ -1565,7 +1565,7 @@ sub update_monitoring_scout {
update rhn_sat_cluster
set vip = ?,
last_update_user = 'upgrade',
- last_update_date = sysdate
+ last_update_date = current_timestamp
where vip is null and
recid = 1};
13 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.3.19-1'
by aparsons
Tag 'spacewalk-web-1.3.19-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-12-23 17:53 +0000
Tagging package [spacewalk-web] version [1.3.19-1] in directory [web/].
Changes since spacecmd-1.3.7-1:
Aron Parsons (2):
remove symlink that accidentily got added
Automatic commit of package [spacewalk-web] release [1.3.19-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/nav/styles | 1 -
web/spacewalk-web.spec | 5 ++++-
3 files changed, 5 insertions(+), 3 deletions(-)
---
13 years, 3 months
2 commits - rel-eng/packages web/html web/spacewalk-web.spec
by aparsons
rel-eng/packages/spacewalk-web | 2 +-
web/html/nav/styles | 1 -
web/spacewalk-web.spec | 5 ++++-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 64e901bc48027e73e644d2fa4a0dbc06e6ab5c67
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:53:10 2010 -0500
Automatic commit of package [spacewalk-web] release [1.3.19-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3a485f7..da41efe 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.18-1 web/
+1.3.19-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2bdcf23..0ca58b1 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.18
+Version: 1.3.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.19-1
+- remove symlink that accidentily got added (aparsons(a)redhat.com)
+
* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.18-1
- bump API version number for recent API changes (aparsons(a)redhat.com)
commit a3de699a84f94b74bff7c34993a29c671b8df4be
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:52:16 2010 -0500
remove symlink that accidentily got added
diff --git a/web/html/nav/styles b/web/html/nav/styles
deleted file mode 120000
index dbfef52..0000000
--- a/web/html/nav/styles
+++ /dev/null
@@ -1 +0,0 @@
-/home/spacewalk/spacewalk/branding/styles
\ No newline at end of file
13 years, 3 months
Changes to 'refs/tags/spacecmd-1.3.7-1'
by aparsons
Tag 'spacecmd-1.3.7-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-12-23 17:45 +0000
Tagging package [spacecmd] version [1.3.7-1] in directory [spacecmd/].
Changes since spacewalk-web-1.3.18-1:
Aron Parsons (3):
spacecmd: allow a minimum length in max_length()
spacecmd: added system_syncpackages function
Automatic commit of package [spacecmd] release [1.3.7-1].
---
rel-eng/packages/spacecmd | 2 -
spacecmd/spacecmd.spec | 5 ++-
spacecmd/src/lib/system.py | 68 +++++++++++++++++++++++++++++++++++++++------
spacecmd/src/lib/utils.py | 5 ++-
4 files changed, 69 insertions(+), 11 deletions(-)
---
13 years, 3 months
3 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 -
spacecmd/spacecmd.spec | 5 ++-
spacecmd/src/lib/system.py | 68 +++++++++++++++++++++++++++++++++++++++------
spacecmd/src/lib/utils.py | 5 ++-
4 files changed, 69 insertions(+), 11 deletions(-)
New commits:
commit 0504adc9a79961fa2b340adef2354df3cca85970
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:45:20 2010 -0500
Automatic commit of package [spacecmd] release [1.3.7-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index c9c461f..fe5d588 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.3.6-1 spacecmd/
+1.3.7-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index a4741cc..ba6e156 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.3.6
+Version: 1.3.7
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu Dec 23 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.7-1
+- added system_syncpackages function
+
* Wed Dec 22 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.6-1
- added organization functions
commit 383da4175791e7de56e80f98c03c0aa89d6faab4
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:41:39 2010 -0500
spacecmd: added system_syncpackages function
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 162fb04..0fd47df 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -33,7 +33,7 @@ __PKG_COMPARISONS = { 0 : 'Same',
4 : 'Newer there' }
def print_package_comparison(self, results):
- max_name = max_length( map(itemgetter('package_name'), results) )
+ max_name = max_length(map(itemgetter('package_name'), results), min=7)
# sometimes 'this_system' or 'other_system' can be None
tmp_this = []
@@ -42,10 +42,10 @@ def print_package_comparison(self, results):
tmp_this.append(str(item.get('this_system')))
tmp_other.append(str(item.get('other_system')))
- max_this = max_length(tmp_this)
- max_other = max_length(tmp_other)
+ max_this = max_length(tmp_this, min=11)
+ max_other = max_length(tmp_other, min=12)
- max_comparison = 11
+ max_comparison = 10
# print headers
print '%s %s %s %s' % (
@@ -2365,10 +2365,7 @@ def help_system_comparepackages(self):
print 'usage: system_comparepackages SOME_SYSTEM ANOTHER_SYSTEM'
def complete_system_comparepackages(self, text, line, beg, end):
- parts = line.split(' ')
-
- if len(parts) < 3:
- return self.tab_complete_systems(text)
+ return tab_completer(self.get_system_names(), text)
def do_system_comparepackages(self, args):
(args, options) = parse_arguments(args)
@@ -2386,4 +2383,59 @@ def do_system_comparepackages(self, args):
self.print_package_comparison(results)
+####################
+
+def help_system_syncpackages(self):
+ print 'system_syncpackages: Sync packages between two systems'
+ print 'usage: system_syncpackages SOURCE TARGET'
+
+def complete_system_syncpackages(self, text, line, beg, end):
+ return tab_completer(self.get_system_names(), text)
+
+def do_system_syncpackages(self, args):
+ (args, options) = parse_arguments(args)
+
+ if len(args) != 2:
+ self.help_system_syncpackages()
+ return
+
+ (source, target) = args
+
+ source_id = self.get_system_id(source)
+ target_id = self.get_system_id(target)
+
+ if not source_id or not target_id:
+ return
+
+ # show a comparison and ask for confirmation
+ self.do_system_comparepackages('%s %s' % (source_id, target_id))
+
+ if not self.user_confirm('Sync packages [y/N]:'):
+ return
+
+ start_time = parse_time_input('now')
+
+ # get package IDs
+ packages = self.client.system.listPackages(self.session, source_id)
+
+ if self.check_api_version('10.16'):
+ package_ids = [p.get('id') for p in packages]
+ else:
+ package_names = build_package_names(packages)
+
+ package_ids = []
+
+ for name in package_names:
+ pkg_id = self.get_package_id(name)
+
+ # filter out invalid package IDs
+ if pkg_id:
+ package_ids.append(pkg_id)
+
+ self.client.system.scheduleSyncPackagesWithSystem(self.session,
+ target_id,
+ source_id,
+ package_ids,
+ start_time)
+
# vim:ts=4:expandtab:
commit 7b3ec891cf32c5337c5fef038c18e29412e7ae14
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 23 12:41:13 2010 -0500
spacecmd: allow a minimum length in max_length()
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index baa9508..812f4db 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -442,12 +442,15 @@ def list_locales():
# find the longest string in a list
-def max_length(items):
+def max_length(items, min=0):
max_size = 1
for item in items:
if len(item) > max_size:
max_size = len(item)
+ if max_size < min:
+ max_size = min
+
return max_size
13 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.3.18-1'
by aparsons
Tag 'spacewalk-web-1.3.18-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-12-23 17:43 +0000
Tagging package [spacewalk-web] version [1.3.18-1] in directory [web/].
Changes since spacewalk-java-1.3.33-1:
Aron Parsons (1):
Automatic commit of package [spacewalk-web] release [1.3.18-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.3.33-1'
by aparsons
Tag 'spacewalk-java-1.3.33-1' created by Aron Parsons <aparsons(a)redhat.com> at 2010-12-23 17:42 +0000
Tagging package [spacewalk-java] version [1.3.33-1] in directory [java/].
Changes since spacewalk-schema-1.3.8-1:
Aron Parsons (3):
add package ID to array returned by system.listPackages API call
bump API version number for recent API changes
Automatic commit of package [spacewalk-java] release [1.3.33-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1 +
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
web/conf/rhn_web.conf | 2 +-
web/html/nav/styles | 1 +
6 files changed, 10 insertions(+), 4 deletions(-)
---
13 years, 3 months