# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: prasadjoshi.linux@gmail.com-20130711221921-\
#   mf691iipc7xj1p9s
# target_branch: http://bazaar.launchpad.net/~ubuntu-\
#   branches/ubuntu/saucy/chm2pdf/saucy/
# testament_sha1: cbd36fb9b34c80dddd77763c3703a2ab00399c24
# timestamp: 2013-07-12 04:02:33 +0530
# message: BUG FIX
# base_revision_id: james.westby@ubuntu.com-20110524160940-\
#   eg7c8s62pluifxod
# 
# Begin patch
=== modified file 'chm2pdf'
--- chm2pdf	2008-08-05 19:39:01 +0000
+++ chm2pdf	2013-07-11 22:19:21 +0000
@@ -110,7 +110,8 @@
     takes the list of files inside the chm archive, with the correct urls of each one.
     '''
 
-    os.system('enum_chmLib '+filename+' > '+CHM2PDF_WORK_DIR+'/urlslist.txt')
+    cmd = "enum_chmLib '%s' > '%s/urlslist.txt'" % (filename, CHM2PDF_WORK_DIR)
+    os.system(cmd)
     flist=open(CHM2PDF_WORK_DIR+'/urlslist.txt','rU')
     urls_list=[]
     for line in flist.readlines()[3:]:
@@ -119,7 +120,7 @@
         urls_list.append(spline[5])
     flist.close()
     # os.remove(CHM2PDF_WORK_DIR+'/urlslist.txt')
-    
+
     return urls_list
 
 
@@ -386,7 +387,7 @@
  
         if os.path.exists(page_filename) and (options['titlefile'] == '' or not options['titlefile'] in url):
             htmlout_filename=CHM2PDF_WORK_DIR+'/temp'+'%(#)04d' %{"#":c}+'.html'
-            htmlout_filename_list+=' '+ htmlout_filename
+            htmlout_filename_list += " '%s'" % (htmlout_filename)
             htmlout_filenames.append(htmlout_filename)
     
             if options['dontextract'] == '':
@@ -589,9 +590,11 @@
             elif key=='version': htmldoc_opts += ' ' + value
             elif key=='webpage': htmldoc_opts += ' ' + value
            
+    cmd = "htmldoc %s %s -f '%s' > /dev/null" % (htmldoc_opts, htmlout_filename_list, outputfilename)
     if options['verbose']=='--verbose' and options['verbositylevel']=='high':
-        print 'htmldoc' + htmldoc_opts + ' ' + htmlout_filename_list + " -f "+ outputfilename + " > /dev/null"
-    exit_value=os.system ('htmldoc' + htmldoc_opts + ' ' + htmlout_filename_list + " -f "+ outputfilename + " > /dev/null")
+        print cmd
+
+    exit_value=os.system(cmd)
 
     if exit_value != 0:
         print 'Something wrong happened when launching htmldoc.'
@@ -1072,7 +1075,7 @@
     else:
         usage(sys.argv[0])
         return
- 
+
     CHM2PDF_WORK_DIR = CHM2PDF_TEMP_WORK_DIR + os.sep + basename
     CHM2PDF_ORIG_DIR = CHM2PDF_TEMP_ORIG_DIR + os.sep + basename
 
@@ -1088,8 +1091,8 @@
     if options['dontextract'] == '':
         if options['verbose']=='--verbose' and options['verbositylevel']=='high':
             print 'Removing any previous temporary files...'
-        os.system('rm -r '+CHM2PDF_ORIG_DIR+'/*')
-        os.system('rm -r '+CHM2PDF_WORK_DIR+'/*')
+        cmd = "rm -r '%s'/* '%s'/*" % (CHM2PDF_ORIG_DIR, CHM2PDF_WORK_DIR)
+        os.system(cmd)
     
     cfile = chm.CHMFile()
     cfile.LoadCHM(filename)
@@ -1100,9 +1103,11 @@
             print 'Will use the files in ' + CHM2PDF_ORIG_DIR + ' and ' + CHM2PDF_WORK_DIR + '.'
     else:
         if options['verbose'] == '--verbose' and options['verbositylevel'] == 'high':
-            os.system('extract_chmLib ' + filename + ' ' + CHM2PDF_ORIG_DIR)
+            cmd = "extract_chmLib '%s' '%s'" % (filename, CHM2PDF_ORIG_DIR)
+            os.system(cmd)
         else:
-            os.system('extract_chmLib ' + filename + ' ' + CHM2PDF_ORIG_DIR + '&> /dev/null')
+            cmd = "extract_chmLib '%s' '%s' &>/dev/null" % (filename, CHM2PDF_ORIG_DIR)
+            os.system(cmd)
     
     convert_to_pdf(cfile, filename, outputfilename, options)
 

# Begin bundle
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