rel-eng/packages web/spacewalk-web.spec
by Dimitar Yordanov
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9ca8e4f8f2b0502c882949e854719958fb40e2dc
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Aug 28 14:40:18 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 357e762..809f377 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.13-1 web/
+2.1.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6dd8b1b..3237bda 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.13
+Version: 2.1.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 28 2013 Dimitar Yordanov <dyordano(a)redhat.com> 2.1.14-1
+- 1001826 - restrictions to channel name
+
* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.13-1
- Revert "1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-
config"
10 years, 8 months
web/html web/modules
by Dimitar Yordanov
web/html/network/software/channels/manage/edit.pxt | 12 ++++++++----
web/modules/sniglets/Sniglets/ChannelEditor.pm | 6 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit b0bcb7a3aeb032cd4e2e21277fae824dd0f7f248
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Tue Aug 27 23:16:02 2013 +0200
1001826 - restrictions to channel name
diff --git a/web/html/network/software/channels/manage/edit.pxt b/web/html/network/software/channels/manage/edit.pxt
index 8625448..8285d0d 100644
--- a/web/html/network/software/channels/manage/edit.pxt
+++ b/web/html/network/software/channels/manage/edit.pxt
@@ -25,12 +25,16 @@
channel. Otherwise, the channel is a child of the specified channel.
</p>
<p>
- Channel name and label are required. They each must be at least 6
- characters in length. Labels must begin with a letter, contain only lowercase letters,
- hyphens ('-'), periods ('.'), underscores ('_'), and numerals. Channel name may also contain spaces and forward slashes ('/').
+ Channel name and label are required.
+ They each must be at least 6 characters in length.<br>
+ Channel name must no be longer than 256 characters and channel label must no be longer than 128 characters.<br>
+ Channel label may begin with a letter or digit whether channel name must begin with a letter and for both is not allowed to <br>
+ begin with rhn, redhat or red hat.<br>
+ Further both must contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.<br>
+ Channel name may also contain spaces, parentheses () and forward slashes ('/').
</p>
<p>
- Channel summary is also required.
+ Channel summary is also required and must not exceed 500 characters.
</p>
</div>
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 5f395f5..473993f 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -148,13 +148,13 @@ sub channel_edit_cb {
# bugzilla: 459827 - disallow names longer than 64 characters
unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\(\)\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 256) {
$pxt->push_message(local_alert => "Invalid channel name '" .
- PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, '-', ' / ', '_' and '.'");
+ PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, parentheses, '-', ' / ', '_' and '.'");
$errors++;
}
# bugzilla: 161517 - allow _ in channel labels
- unless ($channel_label =~ /^[a-z\d][a-z\d\-\.\_]*$/ and length($channel_label) >= 6) {
- $pxt->push_message(local_alert => "Invalid channel label '$channel_label' - must be at least 6 characters long, begin with a letter or digit, and contain only lowercase letters, digits, '-', '_', and '.'");
+ unless ($channel_label =~ /^[a-z\d][a-z\d\-\.\_]*$/ and length($channel_label) >= 6 and length($channel_label) <= 128) {
+ $pxt->push_message(local_alert => "Invalid channel label '$channel_label' - must be at least 6 characters long and no longer than 128 characters, begin with a letter or digit, and contain only lowercase letters, digits, '-', '_', and '.'");
$errors++;
}
10 years, 8 months
Changes to 'refs/tags/spacewalk-backend-2.1.12-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-08-28 12:10 +0000
Tagging package [spacewalk-backend] version [2.1.12-1] in directory [backend/].
Changes since spacewalk-proxy-2.1.7-1:
Michael Mraka (3):
1001978 - fixed typo
1001979 - fixed man page
Automatic commit of package [spacewalk-backend] release [2.1.12-1].
---
backend/satellite_tools/satellite-sync.sgml | 11 +++++++++++
backend/satellite_tools/satsync.py | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 18 insertions(+), 3 deletions(-)
---
10 years, 8 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ca1f582672366b786374baa63a34beef809f4d93
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 28 14:10:19 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.12-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8cee3cf..dd9c211 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.11
+Version: 2.1.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Aug 28 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1
+- 1001979 - fixed man page
+- 1001978 - fixed typo
+
* Wed Aug 21 2013 Stephen Herr <sherr(a)redhat.com> 2.1.11-1
- 960550 - completed checkbox was not checked on kickstarts that had no
activation keys
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0dbd27f..4a4d985 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.11-1 backend/
+2.1.12-1 backend/
10 years, 8 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/satellite-sync.sgml | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit f06f38ac32096ce623e5258fa2ca78e5e5698315
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 28 14:08:23 2013 +0200
1001979 - fixed man page
diff --git a/backend/satellite_tools/satellite-sync.sgml b/backend/satellite_tools/satellite-sync.sgml
index b53cf66..7919864 100644
--- a/backend/satellite_tools/satellite-sync.sgml
+++ b/backend/satellite_tools/satellite-sync.sgml
@@ -77,6 +77,9 @@ Incrementally synchronize an Red Hat Satellite's DB data and RPM repository with
<arg>--keep-rpms</arg>
</cmdsynopsis>
<cmdsynopsis>
+ <arg>--master</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
<arg>--debug-level=<replaceable>DEBUG_LEVEL</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -310,6 +313,14 @@ Incrementally synchronize an Red Hat Satellite's DB data and RPM repository with
</listitem>
</varlistentry>
<varlistentry>
+ <term>--master</term>
+ <listitem>
+ <para>the fully qualified doman name of the master Satellite. Valid with
+ --mount-point only. Required if you want to import org data and channel
+ permissions.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--force-all-packages</term>
<listitem>
<simpara>forcibly process full package metadata regardless of diff results.</simpara>
10 years, 8 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/satsync.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 344387ef652516e49dc3c05a90073563d0ae560d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 28 13:59:49 2013 +0200
1001978 - fixed typo
addressing
Traceback (most recent call last):
File "/usr/bin/satellite-sync", line 169, in <module>
sys.exit(abs(main() or 0))
File "/usr/bin/satellite-sync", line 138, in main
return satsync.Runner().main()
File "/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/satsync.py", line 164, in main
actionDict, channels = processCommandline()
File "/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/satsync.py", line 2219, in processCommandline
log2stderr(-1, msg, cleanYN=1)
UnboundLocalError: local variable 'msg' referenced before assignment
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index f63bcaa..55a0c75 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -2215,7 +2215,7 @@ def processCommandline():
if OPTIONS.master:
if not OPTIONS.mount_point:
- mst = _("ERROR: The --master option is only valid with the --mount-point option")
+ msg = _("ERROR: The --master option is only valid with the --mount-point option")
log2stderr(-1, msg, cleanYN=1)
sys.exit(28)
elif CFG.ISS_PARENT:
10 years, 8 months
Changes to 'refs/tags/spacewalk-proxy-2.1.7-1'
by Tomas Lestach
Tag 'spacewalk-proxy-2.1.7-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-28 12:00 +0000
Tagging package [spacewalk-proxy] version [2.1.7-1] in directory [proxy/proxy/].
Changes since spacewalk-web-2.1.13-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-proxy] release [2.1.7-1].
---
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 8 months
Changes to 'refs/tags/spacewalk-web-2.1.13-1'
by Tomas Lestach
Tag 'spacewalk-web-2.1.13-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-28 12:00 +0000
Tagging package [spacewalk-web] version [2.1.13-1] in directory [web/].
Changes since spacewalk-web-2.1.12-1:
Tomas Lestach (3):
Revert "1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config"
1001997 - let spacewalk-proxy-management require spacewalk-base-minimal-config
Automatic commit of package [spacewalk-web] release [2.1.13-1].
---
proxy/proxy/spacewalk-proxy.spec | 1 +
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 8 months
4 commits - proxy/proxy rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
4 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 42a307d3ab1123d1439d22bc4f772df51e9e7a96
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 14:00:53 2013 +0200
Automatic commit of package [spacewalk-proxy] release [2.1.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index dde7429..d204031 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.6
+Version: 2.1.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.7-1
+- 1001997 - let spacewalk-proxy-management require spacewalk-base-minimal-
+ config
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.6-1
- 1000586 - fixing line lenth error
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 75f37fc..240a1ac 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.6-1 proxy/proxy/
+2.1.7-1 proxy/proxy/
commit b00edcea3b96367f95975006827a271cee95172b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 14:00:24 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 02b2c6e..357e762 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.12-1 web/
+2.1.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0fa9bb4..6dd8b1b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.13-1
+- Revert "1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-
+ config"
+
* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.12-1
- 1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config
commit 33095300922667d7a5af99fbfcb011628a74b41d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:59:11 2013 +0200
1001997 - let spacewalk-proxy-management require spacewalk-base-minimal-config
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 917657f..dde7429 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -34,6 +34,7 @@ Requires: spacewalk-backend >= 1.7.24
# python-hashlib is optional for spacewalk-backend-libs
# but we need made it mandatory here
Requires: python-hashlib
+Requires: spacewalk-base-minimal-config
Requires: %{name}-broker = %{version}
Requires: %{name}-redirect = %{version}
Requires: %{name}-common >= %{version}
commit ec2ae9f0360a551fdb09b7c247de7a3d34f79a13
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:55:33 2013 +0200
Revert "1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config"
This reverts commit 5ee39bbe486475d99943e8147259876d1035b913
we do not want spacewalk-base-minimal to require spacewalk-base-minimal-config due to managed-db
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7613603..0fa9bb4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -57,7 +57,6 @@ Summary: Core of Perl modules for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: spacewalk-base-minimal-config
Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0
10 years, 8 months
Changes to 'refs/tags/spacewalk-web-2.1.12-1'
by Tomas Lestach
Tag 'spacewalk-web-2.1.12-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-28 11:40 +0000
Tagging package [spacewalk-web] version [2.1.12-1] in directory [web/].
Changes since spacecmd-2.1.6-1:
Johannes Renner (1):
Fix javascript "Uncaught TypeError"
Michael Mraka (3):
510701 - check compatibility of system and compose arch and version
510701 - compose arch is in .treeinfo
510701 - made error message more descriptive
Tomas Lestach (8):
remove unnecessary cast
removing @Override annotation from method that isn't overriden
removing @Override annotation from methods that aren't overriden
998944 - fix package removal via ssm
1001551 - fix kickstart repositories selection
Revert "Fix javascript "Uncaught TypeError""
1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config
Automatic commit of package [spacewalk-web] release [2.1.12-1].
---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 5
java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java | 3
java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java | 1
java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java | 1
java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 18 ++-
rel-eng/packages/spacewalk-web | 2
satellite/install/install.pl | 55 +++++++---
web/spacewalk-web.spec | 6 -
8 files changed, 68 insertions(+), 23 deletions(-)
---
10 years, 8 months