Changeset 1064 in tailor

Timestamp:

02/12/06 18:33:51 (7 years ago)

Author:

Cameron Patrick <cameron@…>

Hash name:

20060212173351-a57c3-8a8199690e3b006e1f6566fc2c9f1a6efb18730a

Message:

Fix handling of tla archives with "untagged-source unrecognized" set
If a tla archive has the "untagged-source unrecognized" option in its
tagging-method file, tla will complain if there are any foreign files
present (e.g. the _darcs directory containing darcs metadata). The
tla backend was supposed to fix this but the code there didn't work
properly, as it was too fussy about tla exit codes and the output
formats of tla tree-lint.
This patch makes it work again (tested with tla 1.3.3).

File:

• vcpx/tla.py (modified) (1 diff)

vcpx/tla.py

@@ -217 +217 @@
                             command=self.repository.command("tree-lint", "-tu"))
         out = c.execute(stdout=PIPE)[0]
-        tempdir = None
-        if c.exit_status:
-            tempdir = mkdtemp("", "++tailor-", self.basedir)
-            try:
-                for e in out:
-                    e = e.strip()
-                    ht = os.path.split(e)
-                    # only accept inventory violations at the root
-                    if ht[0] and ht[1]:
-                        raise ChangesetApplicationFailure(
-                            "%s complains about \"%s\"" % (str(c), e))
-                    os.rename(os.path.join(self.basedir, e),
-                              os.path.join(tempdir, e))
-            except:
-                self.__restore_foreign_entries(tempdir)
-                raise
+        tempdir = mkdtemp("", "++tailor-", self.basedir)
+        try:
+            for e in out:
+                e = e.strip()
+                ht = os.path.split(e)
+                # only move inventory violations at the root
+                if ht[0] and ht[1]:
+                    continue
+                os.rename(os.path.join(self.basedir, e),
+                          os.path.join(tempdir, e))
+        except:
+            self.__restore_foreign_entries(tempdir)
+            raise
         return tempdir