Ticket #482: haikuporter_multiple_ports.patch

haikuporter

@@ -6 +6 @@
 # copyright 2009 Alexander Deynichenko
 # copyright 2009 HaikuBot (aka RISC)
 # copyright 2010-2011 Jack Laxson (Jrabbit)
+# copyright 2011 Egor Suvorov (aka yeputons)
 
 info = {}
 info['version'] = 'r' + '$Rev$'[6:-2]
@@ -211 +212 @@
             print "Invoke '" + sys.argv[0]\
                  + " -h' for usage information."
             sys.exit(1)
-        else:
-            port = args[0]
-
+        
+        ports = {}
+        installports = 0
+        for port in args:
+            print "Messages for port " + port + ":"
+            res = self.preparePort(port)
+            if isinstance(res, str):
+                print res
+            elif not isinstance(res, bool):
+                ports[port] = res
+                installports = installports + 1
+            print ""
+        if not self.options.yes and len(ports) <> installports:
+             answer = raw_input('Installing %d/%d ports. Continue (y/n + enter)? ' % (len(ports), installports))
+             if answer[0].lower() == 'y':
+                 print ' ok'
+             else:
+                 sys.exit(1)
+        for portname, port in ports.iteritems():
+             print "Installing " + portname + ":"
+             port.installPort()
+    
+    def preparePort(self, port):
         # split the argument into a port name and a version
 
         reWithVersion = re.compile(regExp['portfullname'])
@@ -233 +254 @@
 
                                              # invalid argument
 
-            sys.exit('Error: Invalid port name ' + port)
+            return('Error: Invalid port name ' + port)
 
         # find the port in the HaikuPorts tree
 
         self.portCategory = self.getCategory(self.portName)
         if self.portCategory == None:
-            sys.exit('Error: Port ' + self.portName + ' not found.')
+            return('Error: Port ' + self.portName + ' not found.')
 
         # create full paths for the directories
 
@@ -248 +269 @@
         self.downloadDir = self.portDir + '/' + paths['download']
         self.workDir = self.portDir + '/' + paths['work']
         self.patchesDir = self.portDir + '/' + paths['patches']
+
         self.distroDir = self.portDir + '/' + paths['distro']
 
         # if the port version was not specified, list available versions
@@ -265 +287 @@
                      % self.portName
                 for version in versions:
                     print '  ' + version[0]
-                sys.exit('Run haikuporter again, specifiying a port version'
+                return('Run haikuporter again, specifiying a port version'
                          )
             elif len(versions) == 1:
                 self.portVersion = versions[0][0]
             else:
-                sys.exit('Error: .bep files for ' + self.portName
+                return('Error: .bep files for ' + self.portName
                           + ' not found.')
 
         # show port description, if requested
 
         if options.about:
-            self.printDescription()
-            sys.exit()
+            return(self.printDescription())
 
         # read data from the bep file
 
@@ -287 +308 @@
 
         self.platform = self.detectOS()
         if self.platform == None:
-            sys.exit('Error: Unknown OS platform!')
+            return('Error: Unknown OS platform!')
         else:
             if self.bepKeys['STATUS_' + self.platform] != 'stable':
                 print 'Warning: This port is ' + self.bepKeys['STATUS_'
                          + self.platform] + ' on this platform.'
                 if not self.options.yes:
                     answer = raw_input('Continue (y/n + enter)? ')
-                    if answer == '':
-                        sys.exit(1)
                     if answer[0].lower() == 'y':
                         print ' ok'
                     else:
-                        sys.exit(1)
+                        return(False)
 
         if self.bepKeys['MESSAGE']:
             print self.bepKeys['MESSAGE']
             if not self.options.yes:
                 answer = raw_input('Continue (y/n + enter)? ')
-                if answer == '':
-                    sys.exit(1)
                 if answer[0].lower() == 'y':
                     print ' ok'
                 else:
-                    sys.exit(1)
+                    return(False)
 
         # clean the work dir and don't build when making a source archive
 
@@ -328 +345 @@
 
         if not options.patch:
             options.build = False
+        return self
 
+    def installPort(self):
         self.checkDependencies()  # check dependencies
         self.downloadSource()  # fetch sources
         self.checksumSource()  # calculate checksum
@@ -359 +378 @@
         reEmptyLine = re.compile('^\s*$')
 
         if not os.path.exists(bepFilename):
-            sys.exit('Error: ' + self.portName + ' version '
+            return('Error: ' + self.portName + ' version '
                       + self.portVersion + ' not found.')
 
         fp = open(bepFilename)
@@ -395 +414 @@
         print '*' * 80
 
         fp.close()
+        return True
 
     def setFlag(self, name):
         open('%s/%s-%s.%s' % (self.workDir, self.portName,