diff options
| author | Michael Hudson <michael.hudson@linaro.org> | 2010-12-16 15:01:49 +1300 |
|---|---|---|
| committer | Michael Hudson <michael.hudson@linaro.org> | 2010-12-16 15:01:49 +1300 |
| commit | b018a72aec1895f3d78a7b49a80cfee0712f922c (patch) | |
| tree | 299e7c9a9875b03d8a01eb49a4f4afdfbae60e7d /hwpack | |
| parent | 0e48093c26e88fa445f9bdd755cd90398af1797e (diff) | |
grr
Diffstat (limited to 'hwpack')
| -rw-r--r-- | hwpack/packages.py | 5 | ||||
| -rw-r--r-- | hwpack/testing.py | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/hwpack/packages.py b/hwpack/packages.py index 5186c02..2f2fa5d 100644 --- a/hwpack/packages.py +++ b/hwpack/packages.py @@ -36,9 +36,10 @@ def get_packages_file(packages, extra_text=None, rel_to=None): if extra_text is not None: parts.append(extra_text) parts.append('Version: %s' % package.version) - filename = package.filepath if rel_to is not None: - filename = os.path.relpath(filename, rel_to) + filename = os.path.relpath(package.filepath, rel_to) + else: + filename = package.filename parts.append('Filename: %s' % filename) parts.append('Size: %d' % package.size) parts.append('Architecture: %s' % package.architecture) diff --git a/hwpack/testing.py b/hwpack/testing.py index 839a9a1..eb3282a 100644 --- a/hwpack/testing.py +++ b/hwpack/testing.py @@ -382,9 +382,12 @@ class IsHardwarePack(Matcher): package_matchers = [ MatchesPackage(p) for p in packages_with_content] dep_package_matcher = MatchesStructure( - name=Equals('hwpack-' + self.metadata.name), - version=Equals(self.metadata.version), - architecture=Equals(self.metadata.architecture)) + name=Equals('hwpack-' + self.metadata.name), + version=Equals(self.metadata.version), + architecture=Equals(self.metadata.architecture), + filename=Equals('hwpack-%s_%s_%s.deb' % ( + self.metadata.name, self.metadata.version, + self.metadata.architecture))) if self.package_spec: dep_package_matcher = dep_package_matcher.update( depends=MatchesPackageRelationshipList( |