modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 25 +++++----- 1 file changed, 14 insertions(+), 11 deletions(-)
New commits: commit d85a207d5a9786fec21ded6747b86ff834560d65 Author: Stefan Negrea snegrea@redhat.com Date: Tue Jan 10 16:23:25 2012 -0600
[BZ 773061] Ignore subfolders discovered in the repo folder. This will prevent attempts to import full folders and/or import packages from sub repos.
diff --git a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java index 2c4e907..2c1f079 100644 --- a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java +++ b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java @@ -201,19 +201,22 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource { if (file.getName().equals(repoName)) {
for (File filePackage : file.listFiles()) { - ContentProviderPackageDetails details = createPackage(filePackage); - if (details != null) { - ContentProviderPackageDetails existing = findPackage(packages, details); - if (existing == null) { - report.addNewPackage(details); - } else { - packages.remove(existing); // it still exists, remove it from our list - if (details.getFileCreatedDate().compareTo(existing.getFileCreatedDate()) > 0) { - report.addUpdatedPackage(details); + if (!filePackage.isDirectory()) { + ContentProviderPackageDetails details = createPackage(filePackage); + if (details != null) { + ContentProviderPackageDetails existing = findPackage(packages, details); + if (existing == null) { + report.addNewPackage(details); + } else { + packages.remove(existing); // it still exists, remove it from our list + if (details.getFileCreatedDate().compareTo(existing.getFileCreatedDate()) > 0) { + report.addUpdatedPackage(details); + } } } - } else { - // file does not match any filter and is therefore an unknown type - ignore it + else { + // file does not match any filter and is therefore an unknown type - ignore it + } } }
rhq-commits@lists.fedorahosted.org