Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Akabei frontend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chakra
Akabei
Akabei frontend
Commits
d39af9f4
Commit
d39af9f4
authored
Oct 15, 2014
by
Lukas Appelhans
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Little constification and add --root option to akabei-key
parent
d29fab48
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
8 deletions
+23
-8
syncoperation.cpp
syncoperation.cpp
+2
-2
syncoperation.h
syncoperation.h
+1
-1
tools/akabei-key/main.cpp
tools/akabei-key/main.cpp
+20
-5
No files found.
syncoperation.cpp
View file @
d39af9f4
...
...
@@ -415,11 +415,11 @@ void SyncOperation::updateNextDatabase()
db
->
update
(
forceDbUpdate
);
}
void
SyncOperation
::
databaseErrorTriggered
(
Akabei
::
Error
::
List
errors
)
void
SyncOperation
::
databaseErrorTriggered
(
const
Akabei
::
Error
::
List
&
errors
)
{
QTextStream
err
(
stderr
);
QString
message
=
Akabei
::
errorPrefix
+
QObject
::
tr
(
"There has been an error while updating %1:"
).
arg
(
static_cast
<
AkabeiClient
::
DatabaseHandler
*>
(
QObject
::
sender
())
->
name
()
);
foreach
(
Akabei
::
Error
error
,
errors
)
foreach
(
const
Akabei
::
Error
&
error
,
errors
)
message
.
append
(
' '
+
error
.
description
());
err
<<
m_bar
.
replaceMessage
(
message
)
<<
endl
;
...
...
syncoperation.h
View file @
d39af9f4
...
...
@@ -34,7 +34,7 @@ private slots:
void
showGroup
(
QUuid
,
QList
<
Akabei
::
Group
*>
);
void
databaseStatusChanged
(
AkabeiClient
::
DatabaseHandler
::
Status
);
void
databaseProgressChanged
(
int
);
void
databaseErrorTriggered
(
Akabei
::
Error
::
List
);
void
databaseErrorTriggered
(
const
Akabei
::
Error
::
List
&
);
void
install
(
QUuid
,
QList
<
Akabei
::
Package
*>
);
void
nextOperation
();
...
...
tools/akabei-key/main.cpp
View file @
d39af9f4
...
...
@@ -22,7 +22,7 @@
#define YESNO(x) ((x) == 1 ? QObject::tr("yes") : QObject::tr("no"))
/* Keyring directory */
const
QString
AkabeiKeyringDir
(
"/etc/akabei.d/keyring"
);
QString
AkabeiKeyringDir
(
"/etc/akabei.d/keyring"
);
using
namespace
std
;
...
...
@@ -41,7 +41,7 @@ void printHelp()
QTextStream
out
(
stdout
);
out
<<
QObject
::
tr
(
":: akabei-key v2.0 (Akabei)."
)
<<
endl
;
out
<<
QObject
::
tr
(
"usage: akabei-key [op] [args]"
)
<<
endl
;
out
<<
QObject
::
tr
(
"usage: akabei-key [op] [
--root /path/to/root] [
args]"
)
<<
endl
;
out
<<
endl
;
out
<<
"help, -h, --help"
<<
endl
;
...
...
@@ -323,9 +323,24 @@ void getFromServer(gpgme_ctx_t ctx, QString id)
int
main
(
int
argc
,
char
**
argv
)
{
QCoreApplication
app
(
argc
,
argv
);
QDir
keyring
(
AkabeiKeyringDir
);
QTextStream
out
(
stdout
);
QTextStream
err
(
stderr
);
QStringList
args
=
QCoreApplication
::
arguments
();
if
(
args
.
contains
(
"--root"
))
{
int
index
=
args
.
indexOf
(
"--root"
);
if
(
index
+
1
>=
args
.
count
())
{
printHelp
();
exit
(
-
1
);
}
AkabeiKeyringDir
=
args
[
index
+
1
]
+
"/etc/akabei.d/keyring"
;
args
.
removeAt
(
index
);
args
.
removeAt
(
index
);
}
QDir
keyring
(
AkabeiKeyringDir
);
if
(
!
keyring
.
exists
())
{
out
<<
QObject
::
tr
(
":: akabei-key v2.0 (akabei)"
)
<<
endl
;
...
...
@@ -347,8 +362,8 @@ int main(int argc, char **argv)
err
<<
QObject
::
tr
(
"Cannot access keyring files for writing. Run again this script with higher permissions."
)
<<
endl
;
exit
(
-
1
);
}
QStringList
args
=
QCoreApplication
::
arguments
();
if
(
args
.
size
()
<=
1
)
{
printHelp
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment