mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00
Code

Merge pull request #1265 from andreas-schwab/master

Browse Source 
Pass --force down to delete_package
This commit is contained in:
Daniel Mach 2023-03-09 13:14:12 +01:00 committed by GitHub
commit 8df8ee63aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/core.py
View File

@ -1061,7 +1061,7 @@ class Project:
if state == 'A': if state == 'A':
self.commitNewPackage(pac, msg, todo, verbose=verbose, skip_local_service_run=skip_local_service_run) self.commitNewPackage(pac, msg, todo, verbose=verbose, skip_local_service_run=skip_local_service_run)
elif state == 'D': elif state == 'D':
self.commitDelPackage(pac) self.commitDelPackage(pac, force=force)
elif state == ' ': elif state == ' ':
# display the correct dir when sending the changes # display the correct dir when sending the changes
if os_path_samefile(os.path.join(self.dir, pac), os.getcwd()): if os_path_samefile(os.path.join(self.dir, pac), os.getcwd()):
@ -1091,7 +1091,7 @@ class Project:
# do a simple commit # do a simple commit
Package(os.path.join(self.dir, pac)).commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run) Package(os.path.join(self.dir, pac)).commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run)
elif state == 'D': elif state == 'D':
self.commitDelPackage(pac) self.commitDelPackage(pac, force=force)
elif state == 'A': elif state == 'A':
self.commitNewPackage(pac, msg, verbose=verbose, skip_local_service_run=skip_local_service_run) self.commitNewPackage(pac, msg, verbose=verbose, skip_local_service_run=skip_local_service_run)
finally: finally:
@ -1123,7 +1123,7 @@ class Project:
self.set_state(pac, ' ') self.set_state(pac, ' ')
os.chdir(olddir) os.chdir(olddir)
def commitDelPackage(self, pac): def commitDelPackage(self, pac, force=False):
"""deletes a package on the server and in the working copy""" """deletes a package on the server and in the working copy"""
try: try:
# display the correct dir when sending the changes # display the correct dir when sending the changes
@ -1144,7 +1144,7 @@ class Project:
pass pass
# print statfrmt('Deleting', getTransActPath(os.path.join(self.dir, pac))) # print statfrmt('Deleting', getTransActPath(os.path.join(self.dir, pac)))
print(statfrmt('Deleting', getTransActPath(pac_dir))) print(statfrmt('Deleting', getTransActPath(pac_dir)))
delete_package(self.apiurl, self.name, pac) delete_package(self.apiurl, self.name, pac, force=force)
self.del_package_node(pac) self.del_package_node(pac)
def commitExtPackage(self, pac, msg, files=None, verbose=False, skip_local_service_run=False): def commitExtPackage(self, pac, msg, files=None, verbose=False, skip_local_service_run=False):