Merge lp:~robru/cupstream2distro/absolute-paths-in-watch-ppa into lp:cupstream2distro

[Robert Bruce Park]

Use an absolute path in PackageInPPA class to avoid buggy chdir sloppiness. (LP: 1387819)

[Robert Bruce Park (robru)]

I tested this branch in preprod and was not able to reproduce the bug either with a normal build nor a WATCH_ONLY.

review: Approve

[lp:~robru/cupstream2distro/absolute-paths-in-watch-ppa]

795. By Robert Bruce Park on 2014-10-31

Simplify a bit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:795
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/246/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/246/rebuild

review: Approve (continuous-integration)

=== modified file 'cupstream2distro/packageinppa.py'
--- cupstream2distro/packageinppa.py	2014-10-20 23:06:35 +0000
+++ cupstream2distro/packageinppa.py	2014-10-31 20:10:41 +0000
@@ -23,6 +23,9 @@
 
 import packagemanager
 
+from cupstream2distro.settings import SILOS_DIR
+from cupstream2distro.utils import env, log_value_of
+
 
 class PackageInPPA():
 
@@ -47,8 +50,11 @@
 
         # Get archs we should look at
         version_for_source_file = version.split(':')[-1]
-        dsc_filename = "{}_{}.dsc".format(source_name, version_for_source_file)
+        dsc_filename = os.path.join(
+            SILOS_DIR, env.SILONAME, '{}_{}.dsc'.format(
+                source_name, version_for_source_file))
         regexp = re.compile("^Architecture: (.*)\n")
+        log_value_of.dsc_filename()
         for line in open(dsc_filename):
             arch_lists = regexp.findall(line)
             if arch_lists: