This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit b2883b552bcfee8fc20d14caeec49a5b10b763e3 Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 26 09:42:47 2013 +0200 Changed PackageScanner.searchPkg(File) to return null instead of throwing an exception when no package is found (broken since commit a16544f) --- .../debian/maven/packager/util/PackageScanner.java | 33 +++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java index 109e296..0152299 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/PackageScanner.java @@ -42,18 +42,18 @@ public class PackageScanner { } public DebianDependency searchPkg(File dir, String extension) { - GetPackageContainingPatternResult packageResult = new GetPackageContainingPatternResult(extension); - File cacheId = new File(dir, "<ANY>" + extension); - + // lookup the cache first + File cacheId = new File(dir, "<ANY>" + extension); if (filesInPackages.containsKey(cacheId)) { return new DebianDependency(filesInPackages.get(cacheId)); } + GetPackageContainingPatternResult packageResult = new GetPackageContainingPatternResult(extension); + IOUtil.executeProcess(new String[]{"dpkg", "--search", dir.getAbsolutePath() + "/*/*"}, packageResult); - String pkg = null; if (!packageResult.getPackages().isEmpty()) { - pkg = packageResult.getPackages().iterator().next(); + String pkg = packageResult.getPackages().iterator().next(); filesInPackages.put(cacheId, pkg); return new DebianDependency(pkg); } @@ -70,10 +70,12 @@ public class PackageScanner { } IOUtil.executeProcess(new String[]{"apt-file", "search", dir.getAbsolutePath()}, packageResult); if (!packageResult.getPackages().isEmpty()) { - pkg = packageResult.getPackages().iterator().next(); + String pkg = packageResult.getPackages().iterator().next(); filesInPackages.put(cacheId, pkg); + new DebianDependency(pkg); } - return pkg == null ? null : new DebianDependency(pkg); + + return null; } @@ -92,16 +94,16 @@ public class PackageScanner { } public DebianDependency searchPkg(File fileToSearch) { - GetPackageResult packageResult = new GetPackageResult(); - + // lookup the cache first if (filesInPackages.containsKey(fileToSearch)) { return new DebianDependency(filesInPackages.get(fileToSearch)); } - String pkg = null; + GetPackageResult packageResult = new GetPackageResult(); + IOUtil.executeProcess(new String[]{"dpkg", "--search", fileToSearch.getAbsolutePath()}, packageResult); if (!packageResult.getResult().isEmpty()) { - pkg = packageResult.getResult().iterator().next(); + String pkg = packageResult.getResult().iterator().next(); filesInPackages.put(fileToSearch, pkg); return new DebianDependency(pkg); } @@ -118,10 +120,12 @@ public class PackageScanner { } IOUtil.executeProcess(new String[]{"apt-file", "search", fileToSearch.getAbsolutePath()}, packageResult); if (!packageResult.getResult().isEmpty()) { - pkg = packageResult.getResult().iterator().next(); + String pkg = packageResult.getResult().iterator().next(); filesInPackages.put(fileToSearch, pkg); + return new DebianDependency(pkg); } - return new DebianDependency(pkg); + + return null; } public String getPackageVersion(DebianDependency pkg, boolean onlyInstalled) { @@ -151,8 +155,7 @@ public class PackageScanner { } System.out.println(); System.out.println("Looking for shared jars in package " + library + "..."); - IOUtil.executeProcess(new String[]{"dpkg", "--listfiles", library}, - new SharedJarOutputHandler(jars)); + IOUtil.executeProcess(new String[]{"dpkg", "--listfiles", library}, new SharedJarOutputHandler(jars)); cacheOfSharedJars.put(library, jars); return jars; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
