Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  setup/README: update for recent changes
  Strip contrib/non-free from source names

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/utils.py b/daklib/utils.py
index 1034628ea217ce39b383d0feed9ddce67ad4c90a..abe8f52b87cbff1adb4d23cdd7692145ef13f92a 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1837,7 +1837,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
                 component, = session.query(Component.component_name) \
                     .join(Component.overrides) \
                     .filter(Override.suite == overridesuite) \
-                    .filter(Override.package == source) \
+                    .filter(Override.package == re.sub('/(contrib|non-free)$', '', source)) \
                     .join(Override.overridetype).filter(OverrideType.overridetype == 'dsc') \
                     .first()
                 if component != "main":

diff --git a/setup/README b/setup/README
index 4b9acfb4cbd8dd0864728f966683284e3bb5e257..140ead9192b88a07faa830c632f86f98b9755e9f 100644 (file)
--- a/setup/README
+++ b/setup/README
@@ -8,8 +8,8 @@ and the following packages for dak itself:
    binutils-multiarch python-yaml less python-ldap python-pyrss2gen python-rrdtool
    symlinks python-debian
 
-(the schema assumes at least postgresql 9.0; ftpmaster in Debian currently uses
-the squeeze postgresql 9.0 backport)
+(the schema assumes at least postgresql 9.1; ftpmaster in Debian currently uses
+the squeeze postgresql 9.1 backport)
 
 The following roles are assumed to exist:
  * dak: database superuser: needs to be an actual user
@@ -26,7 +26,7 @@ Set up the dak user:
 Create postgres roles and database:
 # sudo -u postgres psql
   CREATE USER dak CREATEROLE;
-  CREATE ROLE ftpmaster;
+  CREATE ROLE ftpmaster WITH ROLE dak;
   CREATE ROLE ftpteam WITH ROLE ftpmaster;
   CREATE ROLE ftptrainee WITH ROLE ftpmaster, ftpteam;
 
@@ -173,35 +173,14 @@ Add overrides, Edit overrides, Check, Manual reject, Note edit, Prod, [S]kip, Qu
 ACCEPT
 -----------------------------------------------------------------------
 
-At this stage, the package has been ACCEPTed from NEW into NEWSTAGE.
-We now need to finally ACCEPT it into the pool:
+At this stage, the package has been marked as ACCEPTed from NEW.
+We now need to process the NEW policy queue:
 
-# cd /srv/dak/queue/newstage
-# dak process-upload *.changes
+# dak process-policy new
 
 -----------------------------------------------------------------------
-hello_2.6-1_amd64.changes
-ACCEPT
-
-
-hello_2.6-1.debian.tar.gz
-  to main/h/hello/hello_2.6-1.debian.tar.gz
-hello_2.6-1.dsc
-  to main/h/hello/hello_2.6-1.dsc
-hello_2.6-1_amd64.deb
-  to main/h/hello/hello_2.6-1_amd64.deb
-hello_2.6.orig.tar.gz
-  to main/h/hello/hello_2.6.orig.tar.gz
-
-
-Override entries for your package:
-hello_2.6-1.dsc - optional devel
-hello_2.6-1_amd64.deb - optional devel
-
-Announcing to debian-devel-changes@lists.debian.org
-[A]ccept, Skip, Quit ?A
-Installing.
-Installed 1 package set, 646 KB.
+Processing changes file: hello_2.6-1_amd64.changes
+  ACCEPT
 -----------------------------------------------------------------------
 
 We can now see that dak knows about the package: