diff options
| author | Michael Hudson <michael.hudson@linaro.org> | 2010-12-09 14:26:36 +1300 |
|---|---|---|
| committer | Michael Hudson <michael.hudson@linaro.org> | 2010-12-09 14:26:36 +1300 |
| commit | 439694a55d44c1102e09ae1ee84d240e98a9e331 (patch) | |
| tree | ba9041eb1c7a8f9a35de354945270b5076d5030a /hwpack | |
| parent | b91803ac71eaba5461e5423d07ee175eb0d67b8a (diff) | |
rename dependency package to be prefixed with hwpack-
Diffstat (limited to 'hwpack')
| -rw-r--r-- | hwpack/hardwarepack.py | 2 | ||||
| -rw-r--r-- | hwpack/testing.py | 5 | ||||
| -rw-r--r-- | hwpack/tests/test_hardwarepack.py | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/hwpack/hardwarepack.py b/hwpack/hardwarepack.py index 67519f3..1e5ced6 100644 --- a/hwpack/hardwarepack.py +++ b/hwpack/hardwarepack.py @@ -178,7 +178,7 @@ class HardwarePack(object): else: relationships = {} deb_file_path = maker.make_package( - self.metadata.name, self.metadata.version, + 'hwpack-' + self.metadata.name, self.metadata.version, relationships, self.metadata.architecture) self.packages.append(FetchedPackage.from_deb(deb_file_path)) diff --git a/hwpack/testing.py b/hwpack/testing.py index 551b10d..b49f41d 100644 --- a/hwpack/testing.py +++ b/hwpack/testing.py @@ -345,7 +345,8 @@ class IsHardwarePack(Matcher): manifest_lines.append( "%s=%s" % (package.name, package.version)) manifest_lines.append( - "%s=%s" % (self.metadata.name, self.metadata.version)) + "%s=%s" % ( + 'hwpack-' + self.metadata.name, self.metadata.version)) matchers.append( HardwarePackHasFile( "manifest", @@ -362,7 +363,7 @@ class IsHardwarePack(Matcher): package_matchers = [ MatchesPackage(p) for p in packages_with_content] dep_package_matcher = MatchesStructure( - name=Equals(self.metadata.name), + name=Equals('hwpack-' + self.metadata.name), version=Equals(self.metadata.version), architecture=Equals(self.metadata.architecture)) if self.package_spec: diff --git a/hwpack/tests/test_hardwarepack.py b/hwpack/tests/test_hardwarepack.py index e91b649..e90f620 100644 --- a/hwpack/tests/test_hardwarepack.py +++ b/hwpack/tests/test_hardwarepack.py @@ -234,11 +234,11 @@ class HardwarePackTests(TestCase): tf, HardwarePackHasFile( "pkgs/%s_%s_%s.deb" % ( - self.metadata.name, self.metadata.version, + 'hwpack-' + self.metadata.name, self.metadata.version, self.metadata.architecture), content_matcher=MatchesAsPackageContent( MatchesStructure( - name=Equals(self.metadata.name), + name=Equals('hwpack-' + self.metadata.name), architecture=Equals(self.metadata.architecture), depends=Equals(None), version=Equals(self.metadata.version))))) @@ -251,11 +251,11 @@ class HardwarePackTests(TestCase): tf, HardwarePackHasFile( "pkgs/%s_%s_%s.deb" % ( - self.metadata.name, self.metadata.version, + 'hwpack-' + self.metadata.name, self.metadata.version, self.metadata.architecture), content_matcher=MatchesAsPackageContent( MatchesStructure( - name=Equals(self.metadata.name), + name=Equals('hwpack-' + self.metadata.name), architecture=Equals(self.metadata.architecture), depends=Equals("foo, bar (= 1.0)"), version=Equals(self.metadata.version))))) @@ -270,7 +270,7 @@ class HardwarePackTests(TestCase): "pkgs/Packages", content_matcher=MatchesAsPackagesFile( MatchesStructure( - name=Equals(self.metadata.name), + name=Equals('hwpack-' + self.metadata.name), architecture=Equals(self.metadata.architecture), depends=Equals("foo, bar (= 1.0)"), version=Equals(self.metadata.version))))) |