update to 2.1.fb27-1
Signed-off-by: Andy Grover <agrover@redhat.com>
This commit is contained in:
parent
a8fc80634b
commit
aa6306c920
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,3 +25,4 @@
|
||||
/targetcli-fb-2.1.fb24.tar.gz
|
||||
/targetcli-fb-2.1.fb25.tar.gz
|
||||
/targetcli-fb-2.1.fb26.tar.gz
|
||||
/targetcli-fb-2.1.fb27.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
ee4d654ef8071db696229bf817b18f98 targetcli-fb-2.1.fb26.tar.gz
|
||||
3e930c79a1aff77e749e7783acfef13b targetcli-fb-2.1.fb27.tar.gz
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
commit a221a535d718c3abbc53ee44713188d70db65a7d
|
||||
Author: Andy Grover <agrover@redhat.com>
|
||||
Date: Tue Jun 18 10:49:50 2013 -0700
|
||||
|
||||
Catch module load errors
|
||||
|
||||
If targetcli is not run for the first time not as root, refresh() will
|
||||
fail because it can't load modules. This returns a nicer error message
|
||||
in that case.
|
||||
|
||||
See https://bugzilla.redhat.com/show_bug.cgi?id=973852
|
||||
|
||||
Signed-off-by: Andy Grover <agrover@redhat.com>
|
||||
|
||||
diff --git a/scripts/targetcli b/scripts/targetcli
|
||||
index a2cbff1..269dc1a 100755
|
||||
--- a/scripts/targetcli
|
||||
+++ b/scripts/targetcli
|
||||
@@ -64,8 +64,11 @@ def main():
|
||||
|
||||
try:
|
||||
root_node.refresh()
|
||||
- except RTSLibError, error:
|
||||
+ except Exception, error:
|
||||
shell.con.display(shell.con.render_text(str(error), 'red'))
|
||||
+ if not is_root:
|
||||
+ shell.con.display(shell.con.render_text("Retry as root.", 'red'))
|
||||
+ sys.exit(-1)
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
shell.run_cmdline(" ".join(sys.argv[1:]))
|
||||
@ -1,15 +1,14 @@
|
||||
%global oname targetcli-fb
|
||||
|
||||
Name: targetcli
|
||||
License: AGPLv3
|
||||
License: ASL 2.0
|
||||
Group: System Environment/Libraries
|
||||
Summary: An administration shell for storage targets
|
||||
Version: 2.1.fb26
|
||||
Release: 2%{?dist}
|
||||
Version: 2.1.fb27
|
||||
Release: 1%{?dist}
|
||||
URL: https://fedorahosted.org/targetcli-fb/
|
||||
Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
|
||||
Source1: targetcli.service
|
||||
Patch0: %{name}-modules-not-loaded.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
BuildRequires: python-devel python-configshell python-ethtool epydoc
|
||||
@ -29,7 +28,6 @@ users will also need to install and use fcoe-utils.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
@ -67,6 +65,11 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/man8/targetcli.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Jul 23 2013 Andy Grover <agrover@redhat.com> - 2.1.fb27-1
|
||||
- New upstream release
|
||||
- License now Apache 2.0
|
||||
- Remove patch modules-not-loaded.patch
|
||||
|
||||
* Mon Jun 18 2013 Andy Grover <agrover@redhat.com> - 2.1.fb26-2
|
||||
- Add patch
|
||||
* modules-not-loaded.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user