Commit a083fa58 authored by Pavel Vainerman's avatar Pavel Vainerman

Исправил ошибку в обработке userparam для uniset-admin --oinfo

parent 4ac2dbf8
......@@ -244,8 +244,9 @@ int main(int argc, char** argv)
std::string userparam = { "" };
if( checkArg(optind + 1, argc, argv) )
userparam = string(argv[optind + 1]);
// смотрим второй параметр
if( checkArg(optind, argc, argv) )
userparam = string(argv[optind]);
return oinfo(optarg, ui, userparam);
}
......@@ -253,6 +254,7 @@ int main(int argc, char** argv)
case 'a': //--apiRequest
{
// смотрим второй параметр
if( checkArg(optind, argc, argv) == 0 )
{
if( !quiet )
......@@ -338,6 +340,7 @@ int main(int argc, char** argv)
auto conf = uniset_init(argc, argv, conffile);
UInterface ui(conf);
ui.initBackId(uniset::AdminID);
string name = ( optarg ) ? optarg : "";
return logRotate(name, ui);
}
......
......@@ -16,7 +16,7 @@
Name: libuniset2
Version: 2.6
Release: alt4
Release: alt5
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
......@@ -507,6 +507,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# history of current unpublished changes
%changelog
* Thu Dec 08 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt5
- fixed bug in uniset2-admin --oinfo
* Wed Dec 07 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt4
- new version
- getChangedTime --> getTimeChange
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment