Skip to content
Snippets Groups Projects

main: Be clearer about what we are and aren't keeping

Open Simon McVittie requested to merge smcv/osc-plugin-dput:wip/smcv/more-log into master
1 file
+ 8
0
Compare changes
  • Side-by-side
  • Inline
+ 8
0
@@ -137,6 +137,10 @@ def do_dput(self, subcmd, opts, proj_name, dsc_or_changes_file):
# defining file list, so we can decide which one to delete
remote_file_list = dput.get_remote_file_list(package)
for f in remote_file_list:
print('remote file in old package: %r' % f)
local_file_list = [f["name"] for f in dsc.get("Files")] #local lambda list
# Remove old files, but only those that are part of the Debian package
@@ -165,6 +169,9 @@ def do_dput(self, subcmd, opts, proj_name, dsc_or_changes_file):
retained -= superseded
for f in superseded:
print('removing old source file: %r' % f)
# The temporary checkout we're using doesn't seem to have the
# expected result for latest_rev()?
source_rev = osc.core.get_source_rev(conf.config['apiurl'],
@@ -182,6 +189,7 @@ def do_dput(self, subcmd, opts, proj_name, dsc_or_changes_file):
# adding local_file_list to the package as links
for f in local_file_list:
print('adding new source file: %r' % f)
filepath = os.path.join(dscdir, f)
os.symlink(filepath, f)
package.addfile(f)
Loading