Merge lp:~psivaa/utah/bug-1343881 into lp:utah

[Para Siva]

Fix for bug https://bugs.launchpad.net/utah/+bug/1343881.

Fix for bug https://bugs.launchpad.net/utah/+bug/1343881. Skip inserting the release name in the cdimage url only for devel release.

[Paul Larson (pwlars)]

Convert to use distro_info instead please (see: python-distro-info, I think it's used elsewhere in utah probably). This would be more pythonic, and probably a bit more concise as well.

review: Needs Fixing

[lp:~psivaa/utah/bug-1343881]

1053. By Para Siva on 2014-07-18

Fixes with python-distro-info

[Paul Larson (pwlars)]

looks ok to me

review: Approve

[lp:~psivaa/utah/bug-1343881]

1054. By Para Siva on 2014-07-18

Include UbuntuDistroInfo inside try catch

1055. By Para Siva on 2014-07-18

log the errors during distro info finding

[Jean-Baptiste Lallement (jibel)]

In the following code:

17 + try:
18 + ubuntu_distro = distro_info.UbuntuDistroInfo()
19 + except Exception as e:
20 + logging.error("Can not find distro info %s", e.message)
21 +
22 + if self.st_release != ubuntu_distro.devel():
23 + self.url = os.path.join(DEFAULT_URL, self.st_release)
24 + else:

If distro info data is obsolete, ubuntu_distro will be undefined and the rest of the code will fail. I'd rather do:
try:
    ubuntu_distro_devel = distro_info.UbuntuDistroInfo().devel()
except:
    logging.error(...)
    exit

A fallback to a default distro might also be an option but it'll require to update the code every new release.

review: Needs Fixing

[lp:~psivaa/utah/bug-1343881]

1056. By Para Siva on 2014-07-21

Review comment fix- phase 2

[Para Siva (psivaa)]

Thanks for the comments again jibel. Fixed it. Could you pls take a look at rev 1056?

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2014-07-15 09:51:38 +0000
+++ utah/isotest/iso_static_validation.py	2014-07-21 11:44:29 +0000
@@ -57,6 +57,7 @@
 import shutil
 import time
 import platform
+import distro_info
 from traceback import format_exception
 
 import yaml
@@ -163,10 +164,16 @@
                                            self.st_arch])))
         logging.debug('Standard name for this iso is: %s', self.iso_name)
 
-        if self.st_release != 'precise':
+        try:
+            ubuntu_distro_devel = distro_info.UbuntuDistroInfo().devel()
+        except:
+            self.fail("Can not find distro info details. "
+                      "Distro info data could be out of date")
+
+        if self.st_release != ubuntu_distro_devel:
+            self.url = os.path.join(DEFAULT_URL, self.st_release)
+        else:
             self.url = DEFAULT_URL
-        else:
-            self.url = os.path.join(DEFAULT_URL, 'precise')
 
         if self.st_variant == 'desktop':
             self.url = os.path.join(self.url, 'daily-live')
@@ -175,9 +182,9 @@
         elif self.st_variant == 'alternate':
             self.url = os.path.join(self.url, 'daily')
         elif self.st_variant == 'server':
-            if self.st_release == 'precise':
+            if self.st_release != ubuntu_distro_devel:
                 self.url = os.path.join(DEFAULT_URL, 'ubuntu-server',
-                                        'precise', 'daily')
+                                        self.st_release, 'daily')
             else:  # current dev release
                 self.url = os.path.join(DEFAULT_URL, 'ubuntu-server', 'daily')
         else: