[Jpackage-commits] dist/jpackage-utils/devel jpackage-utils-javapackages-0.2.6-maven_depmap.py.patch, NONE, 1.1 jpackage-utils.spec, 1.5, 1.6

David Walluck david at ryu.zarb.org
Sat Oct 15 06:40:16 CEST 2011


Update of /home/projects/jpackage/cvs/dist/jpackage-utils/devel
In directory ryu.zarb.org:/tmp/cvs-serv1766

Modified Files:
	jpackage-utils.spec 
Added Files:
	jpackage-utils-javapackages-0.2.6-maven_depmap.py.patch 
Log Message:
- patch for older python


--- NEW FILE: jpackage-utils-javapackages-0.2.6-maven_depmap.py.patch ---
--- javapackages-0.2.6/scripts/maven_depmap.py	2011-09-15 08:40:28.000000000 -0400
+++ javapackages-0.2.6/scripts/maven_depmap.py	2011-10-15 00:38:08.403481725 -0400
@@ -164,9 +164,11 @@
             g, a = add.strip().split(':')
             maps.append((g, a))
 
-    with open(fragment_path, "aw") as ffile:
-        for m in maps:
-            ffile.write("""
+    try:
+        ffile = open(fragment_path, "aw")
+        try:
+            for m in maps:
+                ffile.write("""
 <dependency>
     <maven>
         <groupId>%s</groupId>
@@ -181,7 +183,10 @@
 </dependency>
 """ % (m[0], m[1], fragment.version, fragment.local_gid,
        fragment.local_aid, fragment.version) )
-
+        finally:
+            ffile.close()
+    except IOError:
+        pass
 
 if __name__ == "__main__":
 

Index: jpackage-utils.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** jpackage-utils.spec	15 Oct 2011 04:06:50 -0000	1.5
--- jpackage-utils.spec	15 Oct 2011 04:40:13 -0000	1.6
***************
*** 27,31 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
  %global gcj_support 1
--- 27,30 ----
***************
*** 40,44 ****
  Name:           jpackage-utils
  Version:        5.0.0
! Release:        6%{?dist}
  Epoch:          0
  Summary:        JPackage utilities
--- 39,43 ----
  Name:           jpackage-utils
  Version:        5.0.0
! Release:        7%{?dist}
  Epoch:          0
  Summary:        JPackage utilities
***************
*** 61,64 ****
--- 60,64 ----
  Patch5:         jpackage-utils-set-classpath.patch
  Patch6:         jpackage-utils-javapackages-0.2.6-macros.fjava-python.patch
+ Patch7:         jpackage-utils-javapackages-0.2.6-maven_depmap.py.patch
  Requires:       coreutils
  Requires:       findutils
***************
*** 121,124 ****
--- 121,125 ----
  %setup -q -T -D -a 8 -n jpackage-utils-1.7.5
  %patch6 -p0
+ %patch7 -p0
  
  #cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
***************
*** 337,340 ****
--- 338,344 ----
  
  %changelog
+ * Sat Oct 15 2011 David Walluck <dwalluck at redhat.com> 0:5.0.0-7
+ - patch for older python
+ 
  * Fri Oct 14 2011 David Walluck <dwalluck at redhat.com> 0:5.0.0-6
  - for compat with Fedora define _javajnidir, but set to %%_javadir




More information about the JPackage-commits mailing list