Merge lp:~james-w/pkgme/annoying-debuild into lp:pkgme

[James Westby]

Write out a debian/source/format that is explicit that the package is native.

Hi,

This fixes bug 1007344 by making it explicit in a debian/source/format file
that the package is intended to be native. This should stop debuild from
prompting the user and causing the failure.

Thanks,

James

[Daniel Holbach (dholbach)]

For both my use-cases this makes it work. Good work!

[Daniel Holbach (dholbach)]

Not sure if I should be reviewing the code as well, but it looks great to me.

[Jonathan Lange (jml)]

review: Approve

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-03-30 16:04:51 +0000
+++ pkgme/package_files.py	2012-06-01 15:30:30 +0000
@@ -229,6 +229,19 @@
 default_package_file_group.add_file_cls(Control)
 
 
+class SourceFormat(DebianPackageFile):
+
+    elements = []
+
+    filename = "source/format"
+
+    def get_contents(self):
+        return "3.0 (native)\n"
+
+
+default_package_file_group.add_file_cls(SourceFormat)
+
+
 class Desktop(TemplatePackageFile):
 
     # See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html

=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-03-30 16:04:51 +0000
+++ pkgme/tests/test_package_files.py	2012-06-01 15:30:30 +0000
@@ -36,6 +36,7 @@
     Desktop,
     PackageFile,
     PackageFileGroup,
+    SourceFormat,
     Rules,
     TemplatePackageFile,
     )
@@ -392,6 +393,27 @@
             ControlStanzaHasField(1, "Description", description))
 
 
+class SourceFormatTests(PackageFileTestCase):
+
+    cls = SourceFormat
+
+    def get_default_args(self):
+        return {}
+
+    def test_path(self):
+        package_file = self.get_object()
+        self.assertEqual(
+            os.path.join(DEBIAN_DIR, "source/format"), package_file.path)
+
+    def test_contents(self):
+        package_file = self.get_object()
+        self.assertEqual("3.0 (native)\n", package_file.get_contents())
+
+    def test_overwrite(self):
+        package_file = self.get_object()
+        self.assertEqual(True, package_file.overwrite)
+
+
 class DesktopFileTests(PackageFileTestCase):
 
     cls = Desktop