import-dsc does not add .pc directory to the commit

Bug #1010551 reported by Dimitri John Ledkov
12
This bug affects 2 people
Affects Status Importance Assigned to Milestone
brz-debian
Triaged
Medium
Unassigned
bzr-builddeb
Triaged
Medium
Unassigned

Bug Description

If import-dsc introduces applied quilt 3.0 patches, the respective .pc control directory is not added to the commit, instead they are reported as 'unknown' by bzr status. Thus resulting in a unexpected branch: patches applied yet .pc is inconsistent with applied patches.

Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Medium
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

I'm seeing this as well. Ideally, I'd like to have a flag to enable/disable (I don't really care which is default) if patches should be applied or not.

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()

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

@ Andrew
You might want to look at these config options:
#quilt-tree-policy=unapplied
#quilt-commit-policy=unapplied

I actually want the patches to be applied to the tree and committed. Or does skiping patches application with dpkg-source, results in bzr-bd to somehow apply them later and stage for the commit?

Jelmer Vernooij (jelmer)
Changed in brz-debian:
status: New → Triaged
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.