Changes to 'refs/tags/spacewalk-utils-2.1.6-1'
by Jan Dobes
Tag 'spacewalk-utils-2.1.6-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-08-08 11:36 +0000
Tagging package [spacewalk-utils] version [2.1.6-1] in directory [utils/].
Changes since spacewalk-admin-2.1.1-1:
Jan Dobes (1):
Automatic commit of package [spacewalk-utils] release [2.1.6-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages utils/spacewalk-utils.spec
by Jan Dobes
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 478fc28a9ea6e755cf7ee2335dd6227ec965187d
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 8 13:36:07 2013 +0200
Automatic commit of package [spacewalk-utils] release [2.1.6-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index d24f297..8301e1f 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.5-1 utils/
+2.1.6-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index f3e96d5..83b8f9f 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.5
+Version: 2.1.6
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Thu Aug 08 2013 Jan Dobes 2.1.6-1
+- 972626 - just call waiting function
+- Change detault username and password.
+
* Tue Aug 06 2013 Jan Dobes 2.1.5-1
- 972626 - simplier and more readable solution
10 years, 10 months
Changes to 'refs/tags/spacewalk-admin-2.1.1-1'
by Jan Dobes
Tag 'spacewalk-admin-2.1.1-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-08-08 11:32 +0000
Tagging package [spacewalk-admin] version [2.1.1-1] in directory [spacewalk/admin/].
Changes since spacewalk-reports-2.1.3-1:
Jan Dobes (4):
972626 - general waiting function
972626 - just call waiting function
fixing decrementation
Automatic commit of package [spacewalk-admin] release [2.1.1-1].
---
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 7 ++++++-
spacewalk/admin/spacewalk-startup-helper | 19 ++++++++++++++++++-
utils/spacewalk-hostname-rename | 19 ++-----------------
4 files changed, 27 insertions(+), 20 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/admin
by Jan Dobes
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit beef18a737b2d447aeb36145c4ca8ef91d22b608
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 8 13:32:09 2013 +0200
Automatic commit of package [spacewalk-admin] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index bfe17d2..0d217a6 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-2.0.1-1 spacewalk/admin/
+2.1.1-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 71d381f..2617483 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for Red Hat Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -90,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Aug 08 2013 Jan Dobes 2.1.1-1
+- fixing decrementation
+- 972626 - general waiting function
+- Bumping package versions for 2.1.
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.1-1
- Bumping package versions for 2.0.
10 years, 10 months
3 commits - spacewalk/admin utils/spacewalk-hostname-rename
by Jan Dobes
spacewalk/admin/spacewalk-startup-helper | 19 ++++++++++++++++++-
utils/spacewalk-hostname-rename | 19 ++-----------------
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit a116d054bd2eef4399e698583d059eded208c68f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 8 13:29:09 2013 +0200
fixing decrementation
diff --git a/spacewalk/admin/spacewalk-startup-helper b/spacewalk/admin/spacewalk-startup-helper
index f9ec125..8d1fde9 100755
--- a/spacewalk/admin/spacewalk-startup-helper
+++ b/spacewalk/admin/spacewalk-startup-helper
@@ -21,7 +21,7 @@ wait_for_jabberd() {
while [ $RETRIES -gt 0 ]
do
/usr/sbin/lsof -t -i :5222 > /dev/null && break
- ((RETRIES-1))
+ ((RETRIES--))
sleep 0.5
done
}
commit c1a818db65e1b7334f1abcf296a31f85aff6adf6
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 8 09:43:14 2013 +0200
972626 - just call waiting function
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 223dd47..b7a0cdb 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -439,23 +439,8 @@ then
fi
fi
-DB_MAX_TRIES=3;
-
-for (( i=1; i<=DB_MAX_TRIES; i++ )) do
- SQL_RET=$(
- echo "$DBSHELL_QUIET
- select 0 from dual;
- $DBSHELL_QUIT
- " | spacewalk-sql --select-mode -
- )
- SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}" # remove spaces
- if [ "$SQL_RET" == "0" ]; then
- break # db is running
- fi
- sleep 3
-done
-
-print_status "${SQL_RET}" "Your database isn't running."
+/usr/sbin/spacewalk-startup-helper wait-for-database
+print_status "${?}" "Your database isn't running."
echo -n "Updating /etc/rhn/rhn.conf ... " | tee -a $LOG
update_rhn_conf
commit fb8646923daf0f147554a952f6934b94c93eb48d
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 8 09:22:18 2013 +0200
972626 - general waiting function
diff --git a/spacewalk/admin/spacewalk-startup-helper b/spacewalk/admin/spacewalk-startup-helper
index 3536b8b..f9ec125 100755
--- a/spacewalk/admin/spacewalk-startup-helper
+++ b/spacewalk/admin/spacewalk-startup-helper
@@ -1,5 +1,21 @@
#!/bin/bash
+wait_for_database() {
+ RETRIES=10;
+ while [ $RETRIES -gt 0 ]; do
+
+ echo "select 0 from dual;" | spacewalk-sql --select-mode - &> /dev/null
+
+ if [ $? -eq 0 ]; then
+ exit 0 # db is running
+ fi
+
+ ((RETRIES--))
+ sleep 1
+ done
+ exit 1
+}
+
wait_for_jabberd() {
RETRIES=10
while [ $RETRIES -gt 0 ]
@@ -58,4 +74,5 @@ case $1 in
ensure-httpd-down) ensure_httpd_down;;
wait-for-jabberd) wait_for_jabberd;;
wait-for-tomcat) wait_for_tomcat;;
+ wait-for-database) wait_for_database;;
esac
10 years, 10 months
Changes to 'refs/tags/spacewalk-reports-2.1.3-1'
by Jiří Mikulka
Tag 'spacewalk-reports-2.1.3-1' created by Jiri Mikulka <jmikulka(a)redhat.com> at 2013-08-08 09:12 +0000
Tagging package [spacewalk-reports] version [2.1.3-1] in directory [reporting/].
Changes since spacewalk-backend-2.1.7-1:
Dimitar Yordanov (1):
Change detault username and password.
Jiri Mikulka (2):
sort multival columns iff there's any content
Automatic commit of package [spacewalk-reports] release [2.1.3-1].
---
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-report | 3 ++-
reporting/spacewalk-reports.spec | 5 ++++-
utils/spacewalk-custom-repository | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
---
10 years, 10 months
rel-eng/packages reporting/spacewalk-reports.spec
by Jiří Mikulka
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4d1b0df72dfc950c1eec1fa41bdf020e085fd946
Author: Jiri Mikulka <jmikulka(a)redhat.com>
Date: Thu Aug 8 11:12:03 2013 +0200
Automatic commit of package [spacewalk-reports] release [2.1.3-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index b37e9d1..13fd8c1 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-2.1.2-1 reporting/
+2.1.3-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index c6aeb97..b2d047a 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Thu Aug 08 2013 Jiri Mikulka <jmikulka(a)redhat.com> 2.1.3-1
+- sort multival columns iff there's any content
+
* Wed Aug 07 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.2-1
- sort multival columns to make reports consistent
10 years, 10 months
reporting/spacewalk-report
by Jiří Mikulka
reporting/spacewalk-report | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d5440fa39075e66dd1cba3015142f91ffffd0642
Author: Jiri Mikulka <jmikulka(a)redhat.com>
Date: Thu Aug 8 11:06:35 2013 +0200
sort multival columns iff there's any content
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 6e2e76e..49f787b 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -244,7 +244,8 @@ if __name__ == '__main__':
if outrow != None:
for m in report.multival_columns_reverted.keys():
- outrow[m] = options.multivalseparator.join(sorted(outrow[m].split(options.multivalseparator)))
+ if outrow[m]:
+ outrow[m] = options.multivalseparator.join(sorted(outrow[m].split(options.multivalseparator)))
writer.writerow(outrow)
else:
for report_name in sorted(reports.available_reports()):
10 years, 10 months
utils/spacewalk-custom-repository
by Dimitar Yordanov
utils/spacewalk-custom-repository | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ebdd9668eeb1e39f92a2cb983d016220b247dca3
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Aug 8 10:43:48 2013 +0200
Change detault username and password.
diff --git a/utils/spacewalk-custom-repository b/utils/spacewalk-custom-repository
index 7de9aa1..3cffd9b 100755
--- a/utils/spacewalk-custom-repository
+++ b/utils/spacewalk-custom-repository
@@ -24,8 +24,8 @@ import re
from spacewalk.common.cli import getUsernamePassword, xmlrpc_login, xmlrpc_logout
DEFAULT_SERVER = "localhost"
-DEFAULT_USER = "admin"
-DEFAULT_PASSWORD = "nimda"
+DEFAULT_USER = "spacewalk"
+DEFAULT_PASSWORD = "spacewalk"
exit_code=0
10 years, 10 months
Changes to 'refs/tags/spacewalk-backend-2.1.7-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-08-07 14:37 +0000
Tagging package [spacewalk-backend] version [2.1.7-1] in directory [backend/].
Changes since spacewalk-reports-2.1.2-1:
Flavio Castelli (1):
Backend: fix broken gettext test
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [2.1.7-1].
---
backend/common/test/unit-test/test_gettext.py | 4 ++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 10 months