← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/debomatic/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/acceptedqueue

  • Committer: Bazaar Package Importer
  • Author(s): Luca Falavigna
  • Date: 2009-02-01 15:38:35 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090201153835-maad8eyhjexymepu
Tags: 0.6-1
* New upstream release.
* Adjust copyright holders.
* Remove all patches (implemented upstream), as well as quilt support.
* Add DM-Upload-Allowed field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/acceptedqueue
1
 
Index: debomatic-0.5/Debomatic/globals.py
2
 
===================================================================
3
 
--- debomatic-0.5.orig/Debomatic/globals.py     2008-09-18 13:43:40.552021076 +0200
4
 
+++ debomatic-0.5/Debomatic/globals.py  2008-09-18 13:44:24.222516441 +0200
5
 
@@ -25,5 +25,6 @@
6
 
 
7
 
 Options = ConfigParser()
8
 
 sema = Semaphores()
9
 
+acceptedqueue = list()
10
 
 packagequeue = dict()
11
 
 
12
 
Index: debomatic-0.5/Debomatic/gpg.py
13
 
===================================================================
14
 
--- debomatic-0.5.orig/Debomatic/gpg.py 2008-09-18 13:43:40.168000030 +0200
15
 
+++ debomatic-0.5/Debomatic/gpg.py      2008-09-18 13:45:00.044551135 +0200
16
 
@@ -26,14 +26,15 @@
17
 
     if globals.Options.getint('gpg', 'gpg'):
18
 
         if not globals.Options.has_option('gpg', 'keyring') or not os.path.exists(globals.Options.get('gpg', 'keyring')):
19
 
             return False
20
 
-        gpgresult = Popen(['gpg', '--primary-keyring', globals.Options.get('gpg', 'keyring'), '--verify', package], stderr=PIPE).communicate()[1]
21
 
-        ID = findall('Good signature from "(.*) <(.*)>"', gpgresult)
22
 
-        if not len(ID):
23
 
-            return False
24
 
-        fd = os.open(package, os.O_RDONLY)
25
 
-        data = os.read(fd, os.fstat(fd).st_size)
26
 
-        os.close(fd)
27
 
-        fd = os.open(package, os.O_WRONLY | os.O_TRUNC)
28
 
-        os.write(fd, findall('Hash: \S+\n\n(.*)\n\n\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-', data, DOTALL)[0])
29
 
-        os.close(fd)
30
 
+        if not package in globals.acceptedqueue:
31
 
+            gpgresult = Popen(['gpg', '--primary-keyring', globals.Options.get('gpg', 'keyring'), '--verify', package], stderr=PIPE).communicate()[1]
32
 
+            ID = findall('Good signature from "(.*) <(.*)>"', gpgresult)
33
 
+            if not len(ID):
34
 
+                return False
35
 
+            fd = os.open(package, os.O_RDONLY)
36
 
+            data = os.read(fd, os.fstat(fd).st_size)
37
 
+            os.close(fd)
38
 
+            fd = os.open(package, os.O_WRONLY | os.O_TRUNC)
39
 
+            os.write(fd, findall('Hash: \S+\n\n(.*)\n\n\-\-\-\-\-BEGIN PGP SIGNATURE\-\-\-\-\-', data, DOTALL)[0])
40
 
+            os.close(fd)
41
 
 
42
 
Index: debomatic-0.5/Debomatic/packages.py
43
 
===================================================================
44
 
--- debomatic-0.5.orig/Debomatic/packages.py    2008-09-18 13:43:40.352009678 +0200
45
 
+++ debomatic-0.5/Debomatic/packages.py 2008-09-18 13:45:33.170440563 +0200
46
 
@@ -72,6 +72,10 @@
47
 
         if os.path.exists(pkgfile):
48
 
             os.remove(pkgfile)
49
 
     del_package(package)
50
 
+    try:
51
 
+        globals.acceptedqueue.remove(package)
52
 
+    except:
53
 
+        pass
54
 
 
55
 
 def fetch_missing_files(package, files, packagedir, distopts):
56
 
     dscfile = None