Merge ~craig.magina/enablement-ppa:master into enablement-ppa:master

[Craig Magina]

Added support for a local url, i.e. http://server/path/to/mirror

[dann frazier (dannf)]

Thanks - looks good, and tested fine. I made a couple of minor changes, just for future reference:

I merged the debian/changelog change into the same changeset as the actual fix. If you do it like that, you can use debcommit to prepare the commit for you. I also left the release unfinished in that commit (UNRELEASED instead of xenial).

review: Approve

[dann frazier (dannf)]

Also, I uploaded to ppa:yarmouth-team/thunderx, if you just want to pocket copy to your enablement ppa.

diff --git a/debian/changelog b/debian/changelog
index 37b3e8f..c1c282e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+enablement-ppa (0.5) xenial; urgency=medium
+
+  * Added support for local urls
+    - LP: 1557022
+
+ -- Craig Magina <[e-mail]>  Tue, 29 Mar 2016 17:06:24 -0400
+
 enablement-ppa (0.4) xenial; urgency=medium
 
   * Don't skip apt-setup preseeding when using a public PPA.
diff --git a/debian/enablement-ppa.postinst b/debian/enablement-ppa.postinst
index 542e0df..fd83b4b 100644
--- a/debian/enablement-ppa.postinst
+++ b/debian/enablement-ppa.postinst
@@ -13,17 +13,36 @@ while :; do
 	    ppa="$RET"
 	    db_get mirror/codename
 	    codename="$RET"
-	    ppa_owner="$(echo $ppa | cut -d: -f2 | cut -d/ -f1)"
-	    ppa_name="$(echo $ppa | cut -d/ -f2)"
 
-	    ppa_url="http://ppa.launchpad.net/${ppa_owner}/${ppa_name}/ubuntu"
-	    if wget "$ppa_url/dists/${codename}/Release" -O - > /dev/null; then
-		ppa_access="public"
-		STATE=$(($STATE + 1))
-		continue
-	    fi
+	    case "$ppa" in
+		ppa*)
+		    ppa_owner="$(echo $ppa | cut -d: -f2 | cut -d/ -f1)"
+		    ppa_name="$(echo $ppa | cut -d/ -f2)"
+
+		    ppa_url="http://ppa.launchpad.net/${ppa_owner}/${ppa_name}/ubuntu"
+		    if wget "$ppa_url/dists/${codename}/Release" -O - > /dev/null; then
+			ppa_access="public"
+			STATE=$(($STATE + 1))
+			continue
+		    fi
 
-	    ppa_url="https://private-ppa.launchpad.net/${ppa_owner}/${ppa_name}/ubuntu"
+		    ppa_url="https://private-ppa.launchpad.net/${ppa_owner}/${ppa_name}/ubuntu"
+		    ;;
+		http*)
+		    ppa_url="$ppa"
+    		    if wget "$ppa_url/dists/${codename}/Release" -O - > /dev/null; then
+			ppa_access="public"
+			STATE=$(($STATE + 1))
+			continue
+		    fi
+		    ;;
+		*)
+		    db_subst enablement-ppa/invalid-ppa PPA "$ppa"
+		    db_fset enablement-ppa/invalid-ppa seen false
+		    db_input critical enablement-ppa/invalid-ppa
+		    STATE=0
+		    ;;
+	    esac
 	    wget --no-check-certificate \
 		 "$ppa_url/dists/${codename}/Release" -O - > /dev/null
 	    case $? in