apt.rb in katello-4.14.0.rc1

- old
+ new

@@ -49,20 +49,10 @@
           )
           popts[:signing_service] = ss[0].pulp_href if ss && ss.length == 1
           popts
         end
 
-        def mirror_publication_options
-          {
-            # Since we are synchronizing the "default" distribution from the simple publisher on the server,
-            # it will be included in the structured publish. Therefore, we MUST NOT use the simple publisher
-            # on the proxy, since this would collide!
-            #simple: true,
-            structured: true # publish real suites (e.g. 'stable')
-          }
-        end
-
         def distribution_options(path)
           {
             base_path: path,
             publication: repo.publication_href,
             name: "#{generate_backend_object_name}"
@@ -85,15 +75,13 @@
               dest_repo_href = ::Katello::Pulp3::Repository::Apt.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
               content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
               # Not needed during incremental update due to dest_base_version
               # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
               # -> I.e. no filters and not an incremental version.
-              unless dest_repo_id_map[:base_version]
-                # Don't perform extra content actions if the repo is a soft copy of its library instance.
-                # Taken care of by the IncrementalUpdate action.
-                unless dest_repo.soft_copy_of_library?
-                  tasks << remove_all_content_from_repo(dest_repo_href)
-                end
+              # Don't perform extra content actions if the repo is a soft copy of its library instance.
+              # Taken care of by the IncrementalUpdate action.
+              if !dest_repo_id_map[:base_version] && !dest_repo.soft_copy_of_library?
+                tasks << remove_all_content_from_repo(dest_repo_href)
               end
               source_repo_ids.each do |source_repo_id|
                 source_repo_version = ::Katello::Repository.find(source_repo_id).version_href
                 config = { source_repo_version: source_repo_version, dest_repo: dest_repo_href, content: content_unit_hrefs }
                 config[:dest_base_version] = dest_repo_id_map[:base_version] if dest_repo_id_map[:base_version]