[svn] r5995 - trunk/tools/dar

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-11-16 14:58:38 +0100 (Fri, 16 Nov 2007)
New Revision: 5995

Modified:
   trunk/tools/dar/dar-build
   trunk/tools/dar/dar-list-perl.py
   trunk/tools/dar/dar-perl.py
Log:
updates

Modified: trunk/tools/dar/dar-build
===================================================================
--- trunk/tools/dar/dar-build	2007-11-16 11:05:22 UTC (rev 5994)
+++ trunk/tools/dar/dar-build	2007-11-16 13:58:38 UTC (rev 5995)
@@ -310,7 +310,7 @@
 					--define \"_builddir $BUILDDIR\" \
 					--define \"_tmppath $TEMPDIR\" \
 					--define \"debug_package %nil\" \
-					--define \"dist $DISTNAME\" \
+					--define \"dtag $DISTNAME\" \
 					--define \"disttag $DISTNAME\" \
 					--define \"$DISTNAME 1\" \
 					--define \"$DISTNICK 1\" \"$NEWSPECFILE\""
@@ -335,7 +335,7 @@
 						--define "_builddir $ROOT/build" \
 						--define "_buildroot $TEMPDIR/$app-$VERSION-$RELEASE-root" \
 						--define "debug_package %nil" \
-						--define "dist $DISTNAME" \
+						--define "dtag $DISTNAME" \
 						--define "disttag $DISTNAME" \
 						--define "$DISTNAME 1" \
 						--define "$DISTNICK 1" \

Modified: trunk/tools/dar/dar-list-perl.py
===================================================================
--- trunk/tools/dar/dar-list-perl.py	2007-11-16 11:05:22 UTC (rev 5994)
+++ trunk/tools/dar/dar-list-perl.py	2007-11-16 13:58:38 UTC (rev 5995)
@@ -20,16 +20,17 @@
 #            print >>sys.stderr, "File %s is recent, skip download." % os.path.basename(url)
             return True
     except:
-        try:
-            req = urllib2.Request(url)
-            fdin = urllib2.urlopen(req)
-        except:
-#            print >>sys.stderr, "Failed to download file from %s" % url
-            return False
-        fdout = open(filename, 'w')
-        fdout.write(fdin.read())
-        fdin.close()
-        fdout.close()
+        pass
+    try:
+        req = urllib2.Request(url)
+        fdin = urllib2.urlopen(req)
+    except:
+#        print >>sys.stderr, "Failed to download file from %s" % url
+        return False
+    fdout = open(filename, 'w')
+    fdout.write(fdin.read())
+    fdin.close()
+    fdout.close()
     return True
 
 def check_version(module, version):

Modified: trunk/tools/dar/dar-perl.py
===================================================================
--- trunk/tools/dar/dar-perl.py	2007-11-16 11:05:22 UTC (rev 5994)
+++ trunk/tools/dar/dar-perl.py	2007-11-16 13:58:38 UTC (rev 5995)
@@ -79,20 +79,21 @@
     filename = os.path.join(tmppath, os.path.basename(url))
     try:
         st = os.stat(filename)
-        if st and st.st_mtime + 1800 > time.time():
+        if st and st.st_mtime + 1800.0 > time.time():
 #            print >>sys.stderr, "File %s is recent, skip download." % os.path.basename(url)
             return True
     except:
-        try:
-            req = urllib2.Request(url)
-            fdin = urllib2.urlopen(req)
-        except:
-#            print >>sys.stderr, "Failed to download file from %s" % url
-            return False
-        fdout = open(filename, 'w')
-        fdout.write(fdin.read())
-        fdin.close()
-        fdout.close()
+        pass
+    try:
+        req = urllib2.Request(url)
+        fdin = urllib2.urlopen(req)
+    except:
+#        print >>sys.stderr, "Failed to download file from %s" % url
+        return False
+    fdout = open(filename, 'w')
+    fdout.write(fdin.read())
+    fdin.close()
+    fdout.close()
     return True
 
 ### FIXME: Create own version comparison instead of using RPM's