Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vmadm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Project-FiFo
FiFo
vmadm
Commits
7e06c6b8
Commit
7e06c6b8
authored
Oct 10, 2017
by
Heinz N. Gies
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return correct errro for already imported datasets
parent
4487694c
Pipeline
#12652838
canceled with stages
in 2 minutes and 8 seconds
Changes
3
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
Cargo.lock
Cargo.lock
+1
-1
Cargo.toml
Cargo.toml
+1
-1
mod.rs
src/images/mod.rs
+2
-1
No files found.
Cargo.lock
View file @
7e06c6b8
[root]
[root]
name = "vmadm"
name = "vmadm"
version = "0.3.
0
"
version = "0.3.
2
"
dependencies = [
dependencies = [
"aud 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"aud 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bzip2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bzip2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
Cargo.toml
View file @
7e06c6b8
[package]
[package]
name
=
"vmadm"
name
=
"vmadm"
version
=
"0.3.
1
"
version
=
"0.3.
2
"
authors
=
[
"Heinz N. Gies <heinz@project-fifo.net>"
]
authors
=
[
"Heinz N. Gies <heinz@project-fifo.net>"
]
[dependencies]
[dependencies]
...
...
src/images/mod.rs
View file @
7e06c6b8
...
@@ -198,7 +198,8 @@ pub fn import(config: &Config, uuid: Uuid) -> Result<i32, Box<Error>> {
...
@@ -198,7 +198,8 @@ pub fn import(config: &Config, uuid: Uuid) -> Result<i32, Box<Error>> {
url
.push_str
(
uuid_str
.as_str
());
url
.push_str
(
uuid_str
.as_str
());
if
zfs
::
is_present
(
dataset
.as_str
())
{
if
zfs
::
is_present
(
dataset
.as_str
())
{
return
Err
(
GenericError
::
bx
(
"Image already imported"
));
let
err
=
format!
(
"Image {} already imported"
,
uuid_str
);
return
Err
(
GenericError
::
bx
(
err
.as_str
()));
};
};
debug!
(
"Fethcing image"
;
"repo"
=>
config
.settings.repo
.clone
(),
debug!
(
"Fethcing image"
;
"repo"
=>
config
.settings.repo
.clone
(),
...
...
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