From 6a6f879497742435dc2997dd43f50fa0eaeb4b5f Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Mar 10 2016 21:14:07 +0000
Subject: add container-build bash completion and enable distgit namepacing (provided by pyrpkg)


Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

---

diff --git a/src/fedpkg.bash b/src/fedpkg.bash
index 3ad1729..8e717fb 100644
--- a/src/fedpkg.bash
+++ b/src/fedpkg.bash
@@ -29,14 +29,16 @@ _fedpkg()
         cur="${COMP_WORDS[COMP_CWORD]}"
         prev="${COMP_WORDS[COMP_CWORD-1]}"
     fi
-    
+
     # global options
 
     local options="--help -v -q"
     local options_value="--dist --user --path"
-    local commands="build chain-build ci clean clog clone co commit compile diff gimmespec giturl help \
-    gitbuildurl import install lint local mockbuild mock-config new new-sources patch prep pull push retire scratch-build sources \
-    srpm switch-branch tag unused-patches update upload verify-files verrel"
+    local commands="build chain-build ci clean clog clone co commit compile \
+    container-build diff gimmespec giturl help gitbuildurl import install lint \
+    local mockbuild mock-config new new-sources patch prep pull push retire \
+    scratch-build sources srpm switch-branch tag unused-patches update upload \
+    verify-files verrel"
 
     # parse main options and get command
 
@@ -128,6 +130,11 @@ _fedpkg()
             options_arch="--arch"
             options_dir="--builddir"
             ;;
+        container-build)
+            options="--scratch"
+            options_target="--target"
+            options_builder="--build-with"
+            ;;
         diff)
             options="--cached"
             after="file"
diff --git a/src/fedpkg.conf b/src/fedpkg.conf
index 9ba79be..74e73ff 100644
--- a/src/fedpkg.conf
+++ b/src/fedpkg.conf
@@ -14,3 +14,4 @@ clone_config =
   bz.default-version rawhide
   bz.default-component %(module)s
   sendemail.to %(module)s-owner@fedoraproject.org
+distgit_namespaced = True
diff --git a/src/fedpkg/__init__.py b/src/fedpkg/__init__.py
index 1cb486d..5f12021 100644
--- a/src/fedpkg/__init__.py
+++ b/src/fedpkg/__init__.py
@@ -26,7 +26,7 @@ class Commands(pyrpkg.Commands):
     def __init__(self, path, lookaside, lookasidehash, lookaside_cgi,
                  gitbaseurl, anongiturl, branchre, kojiconfig,
                  build_client, user=None, dist=None, target=None,
-                 quiet=False):
+                 quiet=False, distgit_namespaced=False):
         """Init the object and some configuration details."""
 
         # We are subclassing to set kojiconfig to none, so that we can
@@ -35,7 +35,8 @@ class Commands(pyrpkg.Commands):
                                        lookaside_cgi, gitbaseurl, anongiturl,
                                        branchre, kojiconfig, build_client,
                                        user=user, dist=dist, target=target,
-                                       quiet=quiet)
+                                       quiet=quiet,
+                                       distgit_namespaced=distgit_namespaced)
 
         # New data
         self.secondary_arch = {