Comment 2 for bug 1010551

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

For anyone who comes after... Here's the quick hack I used just to work around it.

=== modified file 'import_dsc.py'
--- import_dsc.py 2011-12-15 12:44:47 +0000
+++ import_dsc.py 2012-11-26 03:49:59 +0000
@@ -1495,7 +1495,7 @@
     def extract(self):
         self.tempdir = tempfile.mkdtemp()
         dsc_filename = os.path.abspath(self.dsc_path)
- proc = subprocess.Popen("dpkg-source --skip-debianization -x %s"
+ proc = subprocess.Popen("dpkg-source --skip-debianization --skip-patches -x %s"
                 % (dsc_filename,), shell=True,
                 cwd=self.tempdir, stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT, preexec_fn=subprocess_setup)
@@ -1508,7 +1508,7 @@
                 "%s-%s" % (name, str(version.upstream_version)))
         self.extracted_upstream = self.extracted_debianised + ".orig"
         os.rename(self.extracted_debianised, self.extracted_upstream)
- proc = subprocess.Popen("dpkg-source -x %s" % (dsc_filename,), shell=True,
+ proc = subprocess.Popen("dpkg-source -x --skip-patches %s" % (dsc_filename,), shell=True,
                 cwd=self.tempdir, stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT, preexec_fn=subprocess_setup)
         (stdout, _) = proc.communicate()