Ticket #450: try.patch

haikuporter

@@ -24 +24 @@
 import hashlib
 import shutil
 import commands
-from subprocess import check_call, Popen
+from subprocess import check_call, Popen, CalledProcessError
 from optparse import OptionParser
 
 # -- HaikuPorts options -------------------------------------------------------
@@ -626 +626 @@
                 if not os.path.exists(self.workDir):
                         os.mkdir(self.workDir)
 
-                check_call(checkoutCommand, shell=True, cwd=self.workDir)
-
+                try:
+                        check_call(checkoutCommand, shell=True, cwd=self.workDir)
+                except (OSError, CalledProcessError), e:
+                        if self.prompt_installer(checkoutCommand.split()[0]):
+                                check_call(checkoutCommand, shell=True, cwd=self.workDir)
+                        else:
+                                sys.exit()
+                
                 # Set the 'checkout' flag to signal that the checkout is complete
                 # This also tells haikuporter not to attempt an unpack step
                 self.setFlag('checkout')
@@ -685 +691 @@
                         zf.extractall(self.workDir)
                         zf.close()
                 elif archiveFullPath.split("/")[-1].split(".")[-1] == "xz":
-                        Popen(['xz', '-d', '-k', archiveFullPath])
+                        try:
+                                Popen(['xz', '-d', '-k', archiveFullPath])
+                        except (OSError, CalledProcessError), e:
+                                #run the installoptionalsoftware prompt
+                                if self.prompt_installer('xz'):
+                                        Popen(['xz', '-d', '-k', archiveFullPath])
+                                else:
+                                        sys.exit()
                         tar = archiveFullPath[:-3]
                         if tarfile.is_tarfile(tar): 
                                 tf = tarfile.open(tar, 'r')
@@ -880 +893 @@
 
                 print 'Archive saved to: ' + archiveFile
 
+        def prompt_installer(self, name):
+                response =  raw_input("Do you want to install %s? [Y/n]" % name)
+                apps = {'xz': 'XZ-Utils', 'git': 'Git', 'hg': 'mercurial', 'cvs': 'cvs', 'bzr' : 'bazaar'} #map command to package
+                if response in ["y", "Y", "\n", "yes", ''] or  self.options.yes:
+                        check_call('installoptionalpackage' + " " + str(apps[name]), shell=True)
+                        return True
+                else:
+                        print "In order to install this package you need to run installoptionalsoftware %s later or let Haikuports install it for you." % apps[name]
+                        return False
 
         def runCommandSequence(self, rawCommandList, dir, packageMode=False):
                 """Run a sequence of shell commands from a bep file"""