Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
installsystems
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Seblu
installsystems
Commits
39e4dbc2
Commit
39e4dbc2
authored
13 years ago
by
Sebastien Luttringer
Browse files
Options
Downloads
Patches
Plain Diff
Allow del command to keep payload inside repository
new option --preserve, -p is added
parent
360723ab
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bin/is
+3
-1
3 additions, 1 deletion
bin/is
completion/bash/is
+1
-1
1 addition, 1 deletion
completion/bash/is
installsystems/repository.py
+5
-2
5 additions, 2 deletions
installsystems/repository.py
with
9 additions
and
4 deletions
bin/is
+
3
−
1
View file @
39e4dbc2
...
...
@@ -163,7 +163,7 @@ def c_del(parser, args):
repo
.
config
.
name
))
if
not
confirm
():
raise
Exception
(
"
Aborted!
"
)
repo
.
delete
(
img
.
name
,
img
.
version
)
repo
.
delete
(
img
.
name
,
img
.
version
,
payloads
=
not
args
.
preserve
)
def
c_diff
(
parser
,
args
):
'''
...
...
@@ -412,6 +412,8 @@ p_del.add_argument("-b", "--best", action="store_true", default=False,
help
=
"
in best mode, image is the most recent in all repositories
"
)
p_del
.
add_argument
(
"
-f
"
,
"
--force
"
,
action
=
"
store_true
"
,
default
=
False
,
help
=
"
delete image without confirmation
"
)
p_del
.
add_argument
(
"
-p
"
,
"
--preserve
"
,
action
=
"
store_true
"
,
default
=
False
,
help
=
"
preserve payloads. doesn
'
t remove it from repository
"
)
p_del
.
set_defaults
(
func
=
c_del
)
# diff command parser
...
...
This diff is collapsed.
Click to expand it.
completion/bash/is
+
1
−
1
View file @
39e4dbc2
...
...
@@ -79,7 +79,7 @@ _is() {
(( args > 2 )) && _image && _repo
;;
del)
[[ "$cur" == -* ]] && _opt '-h --help -b --best -f --force' && return 0
[[ "$cur" == -* ]] && _opt '-h --help -b --best -f --force
-p --preserve
' && return 0
_image
;;
diff)
...
...
This diff is collapsed.
Click to expand it.
installsystems/repository.py
+
5
−
2
View file @
39e4dbc2
...
...
@@ -287,7 +287,7 @@ class Repository(object):
else
:
arrow
(
"
Nothing to clean
"
)
def
delete
(
self
,
name
,
version
):
def
delete
(
self
,
name
,
version
,
payloads
=
True
):
'''
Delete an image from repository
'''
...
...
@@ -307,8 +307,11 @@ class Repository(object):
self
.
db
.
ask
(
"
DELETE FROM image WHERE md5 = ?
"
,
(
md5s
[
0
],)).
fetchone
()
self
.
db
.
commit
()
# Removing
script image
# Removing
files
arrow
(
"
Removing files from pool
"
)
# if asked don't remove payloads
if
not
payloads
:
md5s
=
[
md5s
[
0
]
]
arrowlevel
(
1
)
for
md5
in
md5s
:
self
.
_remove_file
(
md5
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment